diff --git a/companion/src/companion.cpp b/companion/src/companion.cpp
index 13dfaa5ef8..51886611ea 100644
--- a/companion/src/companion.cpp
+++ b/companion/src/companion.cpp
@@ -156,7 +156,8 @@ int main(int argc, char *argv[])
   delete splash;
   delete mainWin;
 
-  unregisterFirmwares();
+  unregisterSimulators();
+  unregisterOpenTxFirmwares();
   unregisterEEpromInterfaces();
 
 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)
diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index f9655be3ff..3c912622af 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -1642,13 +1642,6 @@ QList<Firmware *> firmwares;
 Firmware * default_firmware_variant;
 Firmware * current_firmware_variant;
 
-void unregisterFirmwares()
-{
-  foreach (Firmware * f, firmwares) {
-    delete f;
-  }
-}
-
 void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound)
 {
   std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 348cc7a39e..41e1cf51fe 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -1489,7 +1489,7 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
 void registerEEpromInterfaces();
 void unregisterEEpromInterfaces();
 void registerOpenTxFirmwares();
-void unregisterFirmwares();
+void unregisterOpenTxFirmwares();
 
 enum EepromLoadErrors {
   NO_ERROR,
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index e74feb3789..d338d0ac43 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -1436,3 +1436,9 @@ void registerOpenTxFirmwares()
   current_firmware_variant = default_firmware_variant;
 }
 
+void unregisterOpenTxFirmwares()
+{
+  foreach (Firmware * f, firmwares) {
+    delete f;
+  }
+}
diff --git a/companion/src/firmwares/opentx/opentxinterface.h b/companion/src/firmwares/opentx/opentxinterface.h
index e7db6737ad..e2f249ecb2 100644
--- a/companion/src/firmwares/opentx/opentxinterface.h
+++ b/companion/src/firmwares/opentx/opentxinterface.h
@@ -130,5 +130,6 @@ class OpenTxFirmware: public Firmware {
 };
 
 void registerOpenTxFirmwares();
+void unregisterOpenTxFirmwares();
 
 #endif
diff --git a/companion/src/simulation/simulatorinterface.cpp b/companion/src/simulation/simulatorinterface.cpp
index cfb0fe3582..6a0034a583 100644
--- a/companion/src/simulation/simulatorinterface.cpp
+++ b/companion/src/simulation/simulatorinterface.cpp
@@ -81,3 +81,9 @@ SimulatorFactory *getSimulatorFactory(const QString &name)
   return NULL;
 }
 
+void unregisterSimulators()
+{
+  foreach(SimulatorFactory *factory, registered_simulators) {
+    delete factory;
+  }
+}
\ No newline at end of file
diff --git a/companion/src/simulation/simulatorinterface.h b/companion/src/simulation/simulatorinterface.h
index 48c67a4be4..a19753ba6f 100644
--- a/companion/src/simulation/simulatorinterface.h
+++ b/companion/src/simulation/simulatorinterface.h
@@ -118,6 +118,7 @@ class SimulatorFactory {
 };
 
 void registerSimulators();
+void unregisterSimulators();
 SimulatorFactory *getSimulatorFactory(const QString &name);
 extern QMap<QString, SimulatorFactory *> registered_simulators;
 
diff --git a/companion/src/simulator.cpp b/companion/src/simulator.cpp
index 45e22ffd88..e8b3fb6530 100644
--- a/companion/src/simulator.cpp
+++ b/companion/src/simulator.cpp
@@ -176,6 +176,9 @@ int main(int argc, char *argv[])
 
   delete dialog;
 
+  unregisterSimulators();
+  unregisterOpenTxFirmwares();
+
 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)
   SDL_Quit();
 #endif