diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/AbstractEdgeGrpcSessionManager.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/AbstractEdgeGrpcSessionManager.java
index 68d5152306..da502f2584 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/AbstractEdgeGrpcSessionManager.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/AbstractEdgeGrpcSessionManager.java
@@ -99,6 +99,10 @@ public abstract class AbstractEdgeGrpcSessionManager extends EdgeGrpcSessionDele
 
     @Override
     public void onConfigurationUpdate(Edge edge) {
+        EdgeSessionState state = getState();
+        if (state != null) {
+            state.setEdge(edge);
+        }
         EdgeUpdateMsg edgeConfig = EdgeUpdateMsg.newBuilder()
                 .setConfiguration(EdgeMsgConstructorUtils.constructEdgeConfiguration(edge)).build();