diff --git a/src/FirmwarePlugin/FirmwarePluginManager.cc b/src/FirmwarePlugin/FirmwarePluginManager.cc
index b2ec571cdb7ce87de4edf8e63f57a5ab8b4f46a5..4cbe2b34f8abf6bcb6fb61a58970a2470b85631a 100644
--- a/src/FirmwarePlugin/FirmwarePluginManager.cc
+++ b/src/FirmwarePlugin/FirmwarePluginManager.cc
@@ -30,14 +30,11 @@ QList<MAV_AUTOPILOT> FirmwarePluginManager::knownFirmwareTypes(void)
 {
     if (_knownFirmwareTypes.isEmpty()) {
         QList<FirmwarePluginFactory*> factoryList = FirmwarePluginFactoryRegister::instance()->pluginFactories();
-
-        for (int i=0; i<factoryList.count(); i++) {
+        for (int i = 0; i < factoryList.count(); i++) {
             _knownFirmwareTypes.append(factoryList[i]->knownFirmwareTypes());
         }
+        _knownFirmwareTypes.append(MAV_AUTOPILOT_GENERIC);
     }
-
-    _knownFirmwareTypes.append(MAV_AUTOPILOT_GENERIC);
-
     return _knownFirmwareTypes;
 }