diff --git a/Makefile b/Makefile
index 8d240752..f080f64b 100644
--- a/Makefile
+++ b/Makefile
@@ -1064,10 +1064,6 @@ ifndef RANLIB
   RANLIB=ranlib
 endif
 
-ifneq ($(HAVE_VM_COMPILED),true)
-  BASE_CFLAGS += -DNO_VM_COMPILED
-endif
-
 TARGETS =
 
 ifndef FULLBINEXT
diff --git a/cmake/shared_sources.cmake b/cmake/shared_sources.cmake
index c2d7af0c..551315b6 100644
--- a/cmake/shared_sources.cmake
+++ b/cmake/shared_sources.cmake
@@ -51,9 +51,6 @@ elseif(ARCH MATCHES "sparc")
     list(APPEND COMMON_SOURCES
         ${SOURCE_DIR}/qcommon/vm_sparc.c
     )
-else()
-    list(APPEND SERVER_DEFINITIONS NO_VM_COMPILED)
-    list(APPEND CLIENT_DEFINITIONS NO_VM_COMPILED)
 endif()
 
 set(SYSTEM_SOURCES
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 0e09ea5b..f442f844 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -155,10 +155,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #elif defined __aarch64__
 #define ARCH_STRING "arm64"
 #define Q3_LITTLE_ENDIAN
-#ifndef NO_VM_COMPILED
 #define NO_VM_COMPILED
 #endif
-#endif
 
 #define DLL_EXT ".dylib"
 
@@ -188,6 +186,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # define ARCH_STRING "x86"
 #elif defined(__aarch64__)
 # define ARCH_STRING "arm64"
+# define NO_VM_COMPILED
 #elif defined(__arm__)
 # define ARCH_STRING "arm"
 #elif defined(__powerpc64__) || defined(__ppc64__)
@@ -196,8 +195,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # define ARCH_STRING "ppc"
 #elif defined(__alpha__)
 # define ARCH_STRING "alpha"
-#else
-# error Unknown or unsupported architecture
+# define NO_VM_COMPILED
 #endif
 
 #if defined __x86_64__
@@ -245,6 +243,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ARCH_STRING "x86_64"
 #elif defined __axp__
 #define ARCH_STRING "alpha"
+#define NO_VM_COMPILED
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
@@ -293,6 +292,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PATH_SEP '/'
 
 #define ARCH_STRING "mips"
+#define NO_VM_COMPILED
 
 #define Q3_BIG_ENDIAN // SGI's MIPS are always big endian
 
@@ -309,6 +309,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PATH_SEP '/'
 
 #define ARCH_STRING "wasm32"
+#define NO_VM_COMPILED
 
 #define Q3_LITTLE_ENDIAN