diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props
index 0cee81fb4b..c15fb84ffa 100644
--- a/build/msw/wx_setup.props
+++ b/build/msw/wx_setup.props
@@ -70,6 +70,9 @@
wxbase$(wxShortVersionString)$(wxSuffix)
+
+ /Zc:threadSafeInit- %(AdditionalOptions)
+
kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;version.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)