diff --git a/scripts/cc.sh b/scripts/cc.sh
index 786c549..9a01771 100755
--- a/scripts/cc.sh
+++ b/scripts/cc.sh
@@ -352,14 +352,6 @@ fi
 
 # Compiler specific flags
 features=""
-case "${TARGET:-}" in
-  arm64* | aarch64*)
-    # Force enable i8mm for arm64, required by ffmpeg
-    # TODO: Check if A10 actually supports this
-    features="i8mm"
-    ;;
-esac
-
 for feature in "${cpu_features[@]}"; do
   case "$CMD" in
     clang*) ;;
diff --git a/stages/50-x265.sh b/stages/50-x265.sh
index e6e4ee3..c1fc372 100644
--- a/stages/50-x265.sh
+++ b/stages/50-x265.sh
@@ -51,7 +51,8 @@ case "$TARGET" in
   aarch64*)
     common_config+=(
       -DCROSS_COMPILE_ARM64=ON
-      -DCROSS_COMPILE_NEON_I8MM=ON
+      # M1 Doesn't support i8mm
+      -DCROSS_COMPILE_NEON_I8MM=OFF
       -DCROSS_COMPILE_NEON_DOTPROD=ON
     )
     ;;
diff --git a/stages/99-ffmpeg.sh b/stages/99-ffmpeg.sh
index ed77de3..6b02429 100755
--- a/stages/99-ffmpeg.sh
+++ b/stages/99-ffmpeg.sh
@@ -83,6 +83,8 @@ case "$TARGET" in
       --x86asmexe=false
       --enable-vfp
       --enable-neon
+      # M1 Doesn't support i8mm
+      --disable-i8mm
     )
     ;;
 esac