diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 963043989c..173497a55b 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1106,7 +1106,7 @@
 // Set this to 1 to be able to use wxCrashReport::Generate() to create mini
 // dumps of your program when it crashes (or at any other moment)
 //
-// Default is 1.
+// Default is 1 if supported by the compiler.
 //
 // Recommended setting: 1, set to 0 if your programs never crash
 #define wxUSE_CRASHREPORT 1
@@ -1115,11 +1115,18 @@
 // machine-readable minidumop created by wxCrashReport::Generate()) stack back
 // trace when your program crashes using wxStackWalker
 //
-// Default is 1.
+// Default is 1 if supported by the compiler.
 //
 // Recommended setting: 1, set to 0 if your programs never crash
 #define wxUSE_STACKWALKER 1
 
+#if !wxUSE_ON_FATAL_EXCEPTION
+    #undef wxUSE_CRASHREPORT
+    #define wxUSE_CRASHREPORT 0
+    #undef wxUSE_STACKWALKER
+    #define wxUSE_STACKWALKER 0
+#endif
+
 // ----------------------------------------------------------------------------
 // obsolete settings
 // ----------------------------------------------------------------------------