diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp
index 260aa0e8c..df99d82e9 100644
--- a/src/blackcore/webdataservices.cpp
+++ b/src/blackcore/webdataservices.cpp
@@ -1318,10 +1318,11 @@ namespace BlackCore
         // individual signals
         if (CEntityFlags::isFinishedReadState(state))
         {
+            // emit one time only
             if (entities.testFlag(CEntityFlags::AirportEntity) && signalEntitiesAlreadyRead(CEntityFlags::AirportEntity)) { emit swiftDbAirportsRead(); }
-            if (entities.testFlag(CEntityFlags::AirlineIcaoEntity) && signalEntitiesAlreadyRead(CEntityFlags::AirlineIcaoEntity)) { emit swiftDbAirlineIcaoRead(); }
+            if (entities.testFlag(CEntityFlags::AirlineIcaoEntity) && signalEntitiesAlreadyRead(CEntityFlags::AirlineIcaoEntity))   { emit swiftDbAirlineIcaoRead(); }
             if (entities.testFlag(CEntityFlags::AircraftIcaoEntity) && signalEntitiesAlreadyRead(CEntityFlags::AircraftIcaoEntity)) { emit swiftDbAircraftIcaoRead(); }
-            if (entities.testFlag(CEntityFlags::ModelEntity) && signalEntitiesAlreadyRead(CEntityFlags::ModelEntity)) { emit swiftDbModelsRead(); }
+            if (entities.testFlag(CEntityFlags::ModelEntity) && signalEntitiesAlreadyRead(CEntityFlags::ModelEntity))               { emit swiftDbModelsRead(); }
             if (entities.testFlag(CEntityFlags::SharedInfoObjectEntity)) { emit sharedInfoObjectsRead(); }
 
             if (m_swiftDbEntitiesRead.testFlag(CEntityFlags::AllIcaoEntities) && signalEntitiesAlreadyRead(CEntityFlags::AllIcaoEntities))
diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/blackgui/components/dbloadoverviewcomponent.cpp
index ca52e6351..3d6e43b5d 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.cpp
+++ b/src/blackgui/components/dbloadoverviewcomponent.cpp
@@ -73,7 +73,7 @@ namespace BlackGui
                 QPointer<CDbLoadOverviewComponent> myself(this);
                 QTimer::singleShot(10 * 1000, this, [ = ]
                 {
-                    if (!myself) { return; }
+                    if (!myself || !sGui || sGui->isShuttingDown()) { return; }
                     this->loadInfoObjects();
                     this->adjustTextWidth();
                 });