diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java
index 1002c81cac..4f11d4c6f1 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java
@@ -31,6 +31,7 @@ import org.eclipse.leshan.server.redis.serialization.RegistrationSerDes;
 import org.thingsboard.server.common.data.device.data.PowerMode;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientState;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.client.ResourceValue;
 
@@ -72,6 +73,8 @@ public class LwM2MClientSerDes {
         });
         o.add("keyTsLatestMap", keyTsLatestMap);
 
+        o.add("state", client.getState().toString());
+
         if (client.getSession() != null) {
             o.add("session", JsonFormat.printer().print(client.getSession()));
         }
@@ -255,6 +258,8 @@ public class LwM2MClientSerDes {
             lwM2mClient.getKeyTsLatestMap().put(entry.getName(), new AtomicLong(entry.getValue().asLong()));
         });
 
+        lwM2mClient.setState(LwM2MClientState.valueOf(o.get("state").asString()));
+
         Class<LwM2mClient> lwM2mClientClass = LwM2mClient.class;
 
         JsonValue session = o.get("session");
diff --git a/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java b/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
index f53e7888f6..70e8bb905e 100644
--- a/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
+++ b/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
@@ -27,6 +27,8 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientState;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 
 import java.net.InetSocketAddress;
@@ -63,6 +65,10 @@ class LwM2MClientSerDesTest {
                         .build();
 
         client.setRegistration(registration);
+        client.setState(LwM2MClientState.REGISTERED);
+
+        client.getSharedAttributes().put("key1", TransportProtos.TsKvProto.newBuilder().setTs(0).setKv(TransportProtos.KeyValueProto.newBuilder().setStringV("test").build()).build());
+        client.getSharedAttributes().put("key2", TransportProtos.TsKvProto.newBuilder().setTs(1).setKv(TransportProtos.KeyValueProto.newBuilder().setDoubleV(1.02).build()).build());
 
         byte[] bytes = LwM2MClientSerDes.serialize(client);
         Assert.assertNotNull(bytes);