diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
index 7537e63462..93aaea43ed 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
@@ -93,7 +93,12 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
         log.debug("Fetched clients from store: {}", fetchedClients);
         fetchedClients.forEach(client -> {
             lwM2mClientsByEndpoint.put(client.getEndpoint(), client);
-            updateFetchedClient(nodeId, client);
+            try {
+                client.lock();
+                updateFetchedClient(nodeId, client);
+            } finally {
+                client.unlock();
+            }
         });
     }