diff --git a/CMake/SetupFfmpeg.cmake b/CMake/SetupFfmpeg.cmake
index bedb432513..d3e605a93b 100644
--- a/CMake/SetupFfmpeg.cmake
+++ b/CMake/SetupFfmpeg.cmake
@@ -33,7 +33,6 @@ if(CMAKE_POSITION_INDEPENDENT_CODE)
 endif()
 
 if(MACOSX)
-  list(APPEND FFMPEG_CONFIGURE "--disable-asm")
   list(APPEND FFMPEG_CONFIGURE "--enable-cross-compile")
   list(APPEND FFMPEG_CONFIGURE "--enable-videotoolbox")
   list(APPEND FFMPEG_CONFIGURE "--extra-cflags=-mmacosx-version-min=11")
diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index 63a8ec2133..502d10d4f3 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -299,6 +299,12 @@ elseif(MACOSX)
   find_library(MAC_FRAME_COREMEDIA CoreMedia ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
   find_library(MAC_FRAME_COREVIDEO CoreVideo ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
   find_library(MAC_FRAME_VIDEOTOOLBOX VideoToolbox ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
+
+  if(NOT YASM_FOUND AND NOT NASM_FOUND)
+    message(FATAL_ERROR
+      "Neither NASM nor YASM were found. Please install at least one of them."
+    )
+  endif()
 elseif(LINUX)
   if(WITH_GTK3)
     find_package("GTK3" 2.0)
@@ -380,7 +386,7 @@ elseif(LINUX)
 
   if(NOT YASM_FOUND AND NOT NASM_FOUND)
     message(FATAL_ERROR
-      "Neither NASM nor YASM were found. Please install at least one of them if you wish for ffmpeg support."
+      "Neither NASM nor YASM were found. Please install at least one of them."
     )
   endif()