diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 43cddc32b8c..443343a4e18 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -58,6 +58,11 @@ else()
   endif()
 endif()
 
+set(WINDOWS_ARM64_MIN_VSCMD_VER 17.12.3)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64" AND $ENV{VSCMD_VER} VERSION_LESS WINDOWS_ARM64_MIN_VSCMD_VER)
+  message(FATAL_ERROR "Windows ARM64 requires VS2022 version ${WINDOWS_ARM64_MIN_VSCMD_VER} or greater - please update your VS2022 install!")
+endif()
+
 if(WITH_BLENDER AND NOT WITH_PYTHON_MODULE)
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender)
 endif()
diff --git a/lib/windows_arm64 b/lib/windows_arm64
index eefd189a14d..6d3b1f5ed94 160000
--- a/lib/windows_arm64
+++ b/lib/windows_arm64
@@ -1 +1 @@
-Subproject commit eefd189a14dd38e2b338ae05d2b214b7f7fb668f
+Subproject commit 6d3b1f5ed94dc43ee7c5e1aa2b7192f4199c5195