diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
index c245ef49..da78a442 100644
--- a/build/CompilerAndLinker.cmake
+++ b/build/CompilerAndLinker.cmake
@@ -168,15 +168,15 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 
     # GDKX scenarios can't use external:W4
 
-    if(WINDOWS_STORE AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.32))
-      list(APPEND COMPILER_SWITCHES "/wd5246")
-    endif()
-
     if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.31)
        AND (XBOX_CONSOLE_TARGET STREQUAL "durango"))
         list(APPEND COMPILER_SWITCHES /Zc:static_assert-)
     endif()
 
+    if(WINDOWS_STORE AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.32))
+      list(APPEND COMPILER_SWITCHES "/wd5246")
+    endif()
+
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)
       if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
         list(APPEND COMPILER_SWITCHES $<$<NOT:$<CONFIG:Debug>>:/Zc:checkGwOdr>)