diff --git a/lib/framework/StatefulService.cpp b/lib/framework/StatefulService.cpp
new file mode 100644
index 0000000..ece6b1f
--- /dev/null
+++ b/lib/framework/StatefulService.cpp
@@ -0,0 +1,3 @@
+#include <StatefulService.h>
+
+update_handler_id_t StateUpdateHandlerInfo::currentUpdatedHandlerId = 0;
diff --git a/lib/framework/StatefulService.h b/lib/framework/StatefulService.h
index 54a876f..cc2e063 100644
--- a/lib/framework/StatefulService.h
+++ b/lib/framework/StatefulService.h
@@ -14,9 +14,9 @@
 
 typedef size_t update_handler_id_t;
 typedef std::function<void(const String& originId)> StateUpdateCallback;
-static update_handler_id_t currentUpdatedHandlerId;
 
 typedef struct StateUpdateHandlerInfo {
+  static update_handler_id_t currentUpdatedHandlerId;
   update_handler_id_t _id;
   StateUpdateCallback _cb;
   bool _allowRemove;