diff --git a/src/entity_manager/entity_manager.cpp b/src/entity_manager/entity_manager.cpp
index ba2af63..8de134a 100644
--- a/src/entity_manager/entity_manager.cpp
+++ b/src/entity_manager/entity_manager.cpp
@@ -467,9 +467,8 @@
 // main properties changed entry
 void EntityManager::propertiesChangedCallback()
 {
-    static size_t instance = 0;
-    instance++;
-    size_t count = instance;
+    propertiesChangedInstance++;
+    size_t count = propertiesChangedInstance;
 
     propertiesChangedTimer.expires_after(std::chrono::milliseconds(500));
 
@@ -532,7 +531,7 @@
 
                     boost::asio::post(io, [this, newConfiguration, count] {
                         publishNewConfiguration(
-                            std::ref(instance), count,
+                            std::ref(propertiesChangedInstance), count,
                             std::ref(propertiesChangedTimer), newConfiguration);
                     });
                 });
diff --git a/src/entity_manager/entity_manager.hpp b/src/entity_manager/entity_manager.hpp
index 636a904..fdcce53 100644
--- a/src/entity_manager/entity_manager.hpp
+++ b/src/entity_manager/entity_manager.hpp
@@ -80,6 +80,7 @@
 
     bool propertiesChangedInProgress = false;
     boost::asio::steady_timer propertiesChangedTimer;
+    size_t propertiesChangedInstance = 0;
 
     void startRemovedTimer(boost::asio::steady_timer& timer,
                            nlohmann::json& systemConfiguration);