diff --git a/src/blackgui/components/dbairlineicaocomponent.cpp b/src/blackgui/components/dbairlineicaocomponent.cpp
index 68d6307ed..53cf588ac 100644
--- a/src/blackgui/components/dbairlineicaocomponent.cpp
+++ b/src/blackgui/components/dbairlineicaocomponent.cpp
@@ -60,7 +60,7 @@ namespace BlackGui
         {
             Q_UNUSED(count);
             if (!sGui || sGui->isShuttingDown() || !sGui->hasWebDataServices()) { return; }
-            if (!entity.testFlag(CEntityFlags::AirlineIcaoEntity) && CEntityFlags::isFinishedReadState(readState)) { return; }
+            if (!entity.testFlag(CEntityFlags::AirlineIcaoEntity)) { return; }
 
             if (CEntityFlags::isFinishedReadState(readState))
             {
@@ -75,7 +75,7 @@ namespace BlackGui
 
         void CDbAirlineIcaoComponent::onEntityDownloadProgress(CEntityFlags::Entity entity, int logId, int progress, qint64 current, qint64 max, const QUrl &url)
         {
-            if (CEntityFlags::AirlineIcaoEntity != entity) { return; }
+            if (!entity.testFlag(CEntityFlags::AirlineIcaoEntity)) { return; }
             this->showDownloadProgress(progress, current, max, url, 5000);
             Q_UNUSED(logId);
         }
diff --git a/src/blackgui/components/dbliverycomponent.cpp b/src/blackgui/components/dbliverycomponent.cpp
index e2bea4867..57239d30b 100644
--- a/src/blackgui/components/dbliverycomponent.cpp
+++ b/src/blackgui/components/dbliverycomponent.cpp
@@ -67,7 +67,7 @@ namespace BlackGui
         {
             Q_UNUSED(count);
             if (!sGui || sGui->isShuttingDown() || !sGui->getWebDataServices()) { return; }
-            if (!entity.testFlag(CEntityFlags::LiveryEntity) && CEntityFlags::isFinishedReadState(readState)) { return; }
+            if (!entity.testFlag(CEntityFlags::LiveryEntity)) { return; }
 
             if (CEntityFlags::isFinishedReadState(readState))
             {
@@ -82,7 +82,7 @@ namespace BlackGui
 
         void CDbLiveryComponent::onEntityDownloadProgress(CEntityFlags::Entity entity, int logId, int progress, qint64 current, qint64 max, const QUrl &url)
         {
-            if (CEntityFlags::LiveryEntity != entity) { return; }
+            if (!entity.testFlag(CEntityFlags::LiveryEntity)) { return; }
             this->showDownloadProgress(progress, current, max, url, 5000);
             Q_UNUSED(logId);
         }
diff --git a/src/blackgui/components/dbmodelcomponent.cpp b/src/blackgui/components/dbmodelcomponent.cpp
index c1b3b5d54..38f89b540 100644
--- a/src/blackgui/components/dbmodelcomponent.cpp
+++ b/src/blackgui/components/dbmodelcomponent.cpp
@@ -115,7 +115,7 @@ namespace BlackGui
 
         void CDbModelComponent::onEntityDownloadProgress(CEntityFlags::Entity entity, int logId, int progress, qint64 current, qint64 max, const QUrl &url)
         {
-            if (CEntityFlags::ModelEntity != entity) { return; }
+            if (!entity.testFlag(CEntityFlags::ModelEntity)) { return; }
             this->showDownloadProgress(progress, current, max, url, 5000);
             Q_UNUSED(logId);
         }