diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
index 13a54e5110..aeb595a193 100644
--- a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
+++ b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
@@ -209,11 +209,11 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements Telemetr
             this.lastActivityTime = System.currentTimeMillis();
         }
 
-        synchronized void sendPing() {
+        synchronized void sendPing(long currentTime) {
             try {
-                if (System.currentTimeMillis() - lastActivityTime >= pingTimeout) {
+                if (currentTime - lastActivityTime >= pingTimeout) {
                     this.asyncRemote.sendPing(ByteBuffer.wrap(new byte[]{}));
-                    lastActivityTime = System.currentTimeMillis();
+                    lastActivityTime = currentTime;
                 }
             } catch (Exception e) {
                 log.trace("[{}] Failed to send ping msg", session.getId(), e);
@@ -313,13 +313,13 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements Telemetr
     }
 
     @Override
-    public void sendPing(TelemetryWebSocketSessionRef sessionRef) throws IOException {
+    public void sendPing(TelemetryWebSocketSessionRef sessionRef, long currentTime) throws IOException {
         String externalId = sessionRef.getSessionId();
         String internalId = externalSessionMap.get(externalId);
         if (internalId != null) {
             SessionMetaData sessionMd = internalSessionMap.get(internalId);
             if (sessionMd != null) {
-                sessionMd.sendPing();
+                sessionMd.sendPing(currentTime);
             } else {
                 log.warn("[{}][{}] Failed to find session by internal id", externalId, internalId);
             }
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
index 1987bc354b..07d7af3165 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
@@ -754,10 +754,11 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
     }
 
     private void sendPing() {
+        long currentTime = System.currentTimeMillis();
         wsSessionsMap.values().forEach(md ->
                 executor.submit(() -> {
                     try {
-                        msgEndpoint.sendPing(md.getSessionRef());
+                        msgEndpoint.sendPing(md.getSessionRef(), currentTime);
                     } catch (IOException e) {
                         log.warn("[{}] Failed to send ping: {}", md.getSessionRef().getSessionId(), e);
                     }
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java
index 9a69e25009..f10038f116 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java
@@ -26,7 +26,7 @@ public interface TelemetryWebSocketMsgEndpoint {
 
     void send(TelemetryWebSocketSessionRef sessionRef, int subscriptionId, String msg) throws IOException;
 
-    void sendPing(TelemetryWebSocketSessionRef sessionRef) throws IOException;
+    void sendPing(TelemetryWebSocketSessionRef sessionRef, long currentTime) throws IOException;
 
     void close(TelemetryWebSocketSessionRef sessionRef, CloseStatus withReason) throws IOException;
 }