diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/activity/AbstractActivityManager.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/activity/AbstractActivityManager.java
index 2c6f6fe268..f754d6f5b1 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/activity/AbstractActivityManager.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/activity/AbstractActivityManager.java
@@ -78,12 +78,12 @@ public abstract class AbstractActivityManager<Key, Metadata> implements Activity
         states.compute(key, (__, stateWrapper) -> {
             if (stateWrapper == null) {
                 ActivityState<Metadata> newState = new ActivityState<>();
-                newState.setMetadata(metadata);
                 stateWrapper = new ActivityStateWrapper();
                 stateWrapper.setState(newState);
                 stateWrapper.setStrategy(getStrategy());
             }
             var state = stateWrapper.getState();
+            state.setMetadata(metadata);
             if (state.getLastRecordedTime() < newLastRecordedTime) {
                 state.setLastRecordedTime(newLastRecordedTime);
             }