diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 9f2e66c982..2ae474ab64 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -138,14 +138,6 @@ add_library(common
   WorkQueueThread.h
 )
 
-if(MSVC AND _M_ARM_64)
-  # Workaround msvc arm64 optimizer bug
-  # TODO remove after updating to VS 17.4
-  set_source_files_properties(
-    Crypto/SHA1.cpp
-    PROPERTIES COMPILE_FLAGS "/d2ssa-peeps-post-color-")
-endif()
-
 if(NOT MSVC AND _M_ARM_64)
   set_source_files_properties(
     Crypto/AES.cpp
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index 14b6f1b5cc..5cb82a6050 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -733,12 +733,7 @@
     <ClCompile Include="Common\Crypto\AES.cpp" />
     <ClCompile Include="Common\Crypto\bn.cpp" />
     <ClCompile Include="Common\Crypto\ec.cpp" />
-    <ClCompile Include="Common\Crypto\SHA1.cpp">
-      <!--Workaround msvc arm64 optimizer bug
-      TODO remove after updating to VS 17.4
-      -->
-      <AdditionalOptions Condition="'$(Platform)'=='ARM64'">/d2ssa-peeps-post-color- %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
+    <ClCompile Include="Common\Crypto\SHA1.cpp" />
     <ClCompile Include="Common\Debug\CodeTrace.cpp" />
     <ClCompile Include="Common\Debug\MemoryPatches.cpp" />
     <ClCompile Include="Common\Debug\Watches.cpp" />