diff --git a/src/entity_manager/entity_manager.cpp b/src/entity_manager/entity_manager.cpp
index f2fbb47..deb62d2 100644
--- a/src/entity_manager/entity_manager.cpp
+++ b/src/entity_manager/entity_manager.cpp
@@ -466,7 +466,6 @@
 // main properties changed entry
 void EntityManager::propertiesChangedCallback()
 {
-    static bool inProgress = false;
     static boost::asio::steady_timer timer(io);
     static size_t instance = 0;
     instance++;
@@ -487,12 +486,12 @@
             return;
         }
 
-        if (inProgress)
+        if (propertiesChangedInProgress)
         {
             propertiesChangedCallback();
             return;
         }
-        inProgress = true;
+        propertiesChangedInProgress = true;
 
         nlohmann::json oldConfiguration = systemConfiguration;
         auto missingConfigurations = std::make_shared<nlohmann::json>();
@@ -502,7 +501,7 @@
         if (!configuration::loadConfigurations(configurations))
         {
             std::cerr << "Could not load configurations\n";
-            inProgress = false;
+            propertiesChangedInProgress = false;
             return;
         }
 
@@ -528,7 +527,7 @@
                     logDeviceAdded(device);
                 }
 
-                inProgress = false;
+                propertiesChangedInProgress = false;
 
                 boost::asio::post(io, [this, newConfiguration, count] {
                     publishNewConfiguration(std::ref(instance), count,