diff --git a/reactos/drivers/storage/class/disk_new/CMakeLists.txt b/reactos/drivers/storage/class/disk_new/CMakeLists.txt
index f97376b5545..19225ff9113 100644
--- a/reactos/drivers/storage/class/disk_new/CMakeLists.txt
+++ b/reactos/drivers/storage/class/disk_new/CMakeLists.txt
@@ -3,8 +3,12 @@ include_directories(..)
 add_library(disk_new SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc)
 
 target_link_libraries(disk_new libcntpr wdmguid)
-if(NOT MSVC AND ARCH MATCHES i386)
-    add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
+if(ARCH MATCHES i386)
+    if(MSVC)
+        add_target_compile_flags(disk_new "/Gz")
+    else()
+        add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
+    endif()
 endif()
 
 set_module_type(disk_new kernelmodedriver)