diff --git a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
index 56fb65c4e2..4d3e668d61 100644
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
@@ -462,9 +462,12 @@ public class DefaultTransportApiService implements TransportApiService {
 
     private DeviceInfoProto getDeviceInfoProto(Device device) throws JsonProcessingException {
         PowerMode powerMode = null;
+        Long edrxCycle = null;
         switch (device.getDeviceData().getTransportConfiguration().getType()) {
             case LWM2M:
-                powerMode = ((Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration()).getPowerMode();
+                Lwm2mDeviceTransportConfiguration transportConfiguration = (Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration();
+                powerMode = transportConfiguration.getPowerMode();
+                edrxCycle = transportConfiguration.getEdrxCycle();
                 break;
         }
 
@@ -482,6 +485,7 @@ public class DefaultTransportApiService implements TransportApiService {
                 .setAdditionalInfo(mapper.writeValueAsString(device.getAdditionalInfo()));
         if (powerMode != null) {
             builder.setPowerMode(powerMode.name());
+            builder.setEdrxCycle(edrxCycle);
         }
         return builder.build();
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
index 085e60212a..2bcd16ae52 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
@@ -29,6 +29,8 @@ public class Lwm2mDeviceTransportConfiguration implements DeviceTransportConfigu
 
     private PowerMode powerMode;
 
+    private Long edrxCycle;
+
     @JsonIgnore
     private Map<String, Object> properties = new HashMap<>();
 
diff --git a/common/queue/src/main/proto/queue.proto b/common/queue/src/main/proto/queue.proto
index 1225e6d824..9b09bf2328 100644
--- a/common/queue/src/main/proto/queue.proto
+++ b/common/queue/src/main/proto/queue.proto
@@ -116,6 +116,7 @@ message DeviceInfoProto {
   int64 customerIdMSB = 10;
   int64 customerIdLSB = 11;
   string powerMode = 12;
+  int64 edrxCycle = 13;
 }
 
 /**
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 2662560d08..0d48ee7b7a 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
@@ -93,6 +93,8 @@ public class LwM2mClient implements Serializable {
     @Getter
     private PowerMode powerMode;
     @Getter
+    private Long edrxCycle;
+    @Getter
     @Setter
     private Registration registration;
 
@@ -115,6 +117,7 @@ public class LwM2mClient implements Serializable {
         this.deviceId = new UUID(session.getDeviceIdMSB(), session.getDeviceIdLSB());
         this.profileId = new UUID(session.getDeviceProfileIdMSB(), session.getDeviceProfileIdLSB());
         this.powerMode = credentials.getDeviceInfo().getPowerMode();
+        this.edrxCycle = credentials.getDeviceInfo().getEdrxCycle();
     }
 
     public void lock() {
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/auth/TransportDeviceInfo.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/auth/TransportDeviceInfo.java
index f6ef357a93..92bd389f60 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/auth/TransportDeviceInfo.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/auth/TransportDeviceInfo.java
@@ -35,5 +35,5 @@ public class TransportDeviceInfo implements Serializable {
     private String deviceType;
     private PowerMode powerMode;
     private String additionalInfo;
-
+    private Long edrxCycle;
 }
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
index dba34957b9..1a46f61fe9 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
@@ -443,6 +443,7 @@ public class DefaultTransportService implements TransportService {
         tdi.setDeviceType(di.getDeviceType());
         if (StringUtils.isNotEmpty(di.getPowerMode())) {
             tdi.setPowerMode(PowerMode.valueOf(di.getPowerMode()));
+            tdi.setEdrxCycle(di.getEdrxCycle());
         }
         return tdi;
     }