diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6cbf92311..9af9c0fd6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -207,6 +207,7 @@ steps:
     sed -i '/^#[ 	]*define LOGFILE/d'        include/config.h
     sed -i '/^#[ 	]*define NEWS/d'           include/config.h
     sed -i '/^#[ 	]*define PANICLOG/d'       include/config.h
+    sed -i '/^#[ 	]*define PANICTRACE/d'     include/config.h
     #sed -i '/^#[ 	]*define STATUS_HILITES/d' include/config.h
     sed -i '/^#[ 	]*define SYSCF/d'          include/config.h
     sed -i '/^#[ 	]*define USER_SOUNDS/d'    include/config.h
diff --git a/src/report.c b/src/report.c
index a65e8aa20..218457e2b 100644
--- a/src/report.c
+++ b/src/report.c
@@ -5,6 +5,10 @@
 #include "hack.h"
 
 /* NB: CRASHREPORT implies PANICTRACE */
+#ifndef PANICTRACE
+#undef CRASHREPORT
+#endif
+
 #ifdef CRASHREPORT
 
 # ifndef NO_SIGNAL