diff --git a/src/Main/ErrorReporter.cxx b/src/Main/ErrorReporter.cxx
index 5d19f5a53..af594dd32 100644
--- a/src/Main/ErrorReporter.cxx
+++ b/src/Main/ErrorReporter.cxx
@@ -34,6 +34,7 @@
 #include <simgear/io/iostreams/sgstream.hxx>
 #include <simgear/structure/commands.hxx>
 
+#include <GUI/MessageBox.hxx>
 #include <GUI/new_gui.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
@@ -701,6 +702,10 @@ void ErrorReporter::update(double dt)
         }
     } // end of locked section
 
+    if (showDialog && flightgear::isHeadlessMode()) {
+        showDialog = false;
+    }
+
     // do not call into another subsystem with our lock held,
     // as this can trigger deadlocks
     if (showDialog) {