diff --git a/reactos/drivers/base/CMakeLists.txt b/reactos/drivers/base/CMakeLists.txt
index a16d0add866..9c5f5ee767b 100644
--- a/reactos/drivers/base/CMakeLists.txt
+++ b/reactos/drivers/base/CMakeLists.txt
@@ -7,7 +7,5 @@ add_subdirectory(kddll)
 else()
 add_subdirectory(kdcom)
 endif()
-if(ARCH MATCHES i386)
-    add_subdirectory(nmidebug)
-endif()
+add_subdirectory(nmidebug)
 add_subdirectory(null)
diff --git a/reactos/drivers/base/nmidebug/nmidebug.c b/reactos/drivers/base/nmidebug/nmidebug.c
index 6a34792665a..4aa279130eb 100644
--- a/reactos/drivers/base/nmidebug/nmidebug.c
+++ b/reactos/drivers/base/nmidebug/nmidebug.c
@@ -21,6 +21,7 @@ NmiClearFlag(VOID)
 {
     ((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]);
     ((PCHAR)&KiBugCheckData[4])[3] |= 1;
+#ifdef _M_IX86
 #ifdef _MSC_VER
     __asm
     {
@@ -29,6 +30,7 @@ NmiClearFlag(VOID)
 #else
     __asm__("rcrl %b[shift], %k[retval]" : [retval] "=rm" (KiBugCheckData[4]) : "[retval]" (KiBugCheckData[4]), [shift] "Nc" (8));
 #endif
+#endif
 }
 
 BOOLEAN
@@ -44,7 +46,9 @@ NmiDbgCallback(IN PVOID Context,
     ((void(*)())&KiBugCheckData[4])();
 
     /* Handle the NMI safely */
+#ifdef _M_IX86
     KiEnableTimerWatchdog = (RtlCompareMemory(NmiBegin, NmiBegin + 4, 4) != 4);
+#endif
     return TRUE;
 }