diff --git a/server/process.h b/server/process.h
index 59625f0af6d..fa7f60df50c 100644
--- a/server/process.h
+++ b/server/process.h
@@ -107,7 +107,7 @@ struct process_snapshot
 };
 
 #define CPU_FLAG(cpu) (1 << (cpu))
-#define CPU_64BIT_MASK CPU_FLAG(CPU_x86_64)
+#define CPU_64BIT_MASK (CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_ARM64))
 
 /* process functions */
 
diff --git a/server/thread.c b/server/thread.c
index 906b79dad6d..6c5d12d0eeb 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -62,7 +62,7 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC);
 #elif defined(__arm__)
 static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM);
 #elif defined(__aarch64__)
-static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM64);
+static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM64) | CPU_FLAG(CPU_ARM);
 #else
 #error Unsupported CPU
 #endif