diff --git a/control/main.cpp b/control/main.cpp
index ba9c612..5e81e99 100644
--- a/control/main.cpp
+++ b/control/main.cpp
@@ -31,9 +31,21 @@
 #include <sdeventplus/source/signal.hpp>
 #include <stdplus/signal.hpp>
 
+#include <fstream>
+
 using namespace phosphor::fan::control;
 using namespace phosphor::logging;
 
+#ifdef CONTROL_USE_JSON
+void dumpFlightRecorder()
+{
+    nlohmann::json data;
+    phosphor::fan::control::json::FlightRecorder::instance().dump(data);
+    std::ofstream file{json::Manager::dumpFile};
+    file << std::setw(4) << data;
+}
+#endif
+
 int main(int argc, char* argv[])
 {
     auto event = phosphor::fan::util::SDEventPlus::getEvent();
@@ -135,7 +147,7 @@
 #ifdef CONTROL_USE_JSON
         phosphor::fan::control::json::FlightRecorder::instance().log(
             "main", "Unexpected exception exit");
-        phosphor::fan::control::json::FlightRecorder::instance().dump();
+        dumpFlightRecorder();
 #endif
         throw;
     }
@@ -143,7 +155,7 @@
 #ifdef CONTROL_USE_JSON
     phosphor::fan::control::json::FlightRecorder::instance().log(
         "main", "Abnormal exit");
-    phosphor::fan::control::json::FlightRecorder::instance().dump();
+    dumpFlightRecorder();
 #endif
 
     return 1;