diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
index 405050bd71..705ed45995 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
@@ -465,7 +465,7 @@ public class LwM2mClient {
                     ver = getDefaultObjectIDVer();
                 }
                 this.supportedClientObjects.put(lwM2mPath.getObjectId(), ver);
-            } else if (this.supportedClientObjects.get(lwM2mPath.getObjectId()) == null){
+            } else if (lwM2mPath.getObjectId() != null && this.supportedClientObjects.get(lwM2mPath.getObjectId()) == null){
                 this.supportedClientObjects.put(lwM2mPath.getObjectId(), getDefaultObjectIDVer());
             }
         }