diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
index ba77616f77..121772a01b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
@@ -253,11 +253,13 @@ public final class EdgeGrpcSession implements Closeable {
     }
 
     private void sendResponseMsg(ResponseMsg responseMsg) {
-        try {
-            responseMsgLock.lock();
-            outputStream.onNext(responseMsg);
-        } finally {
-            responseMsgLock.unlock();
+        if (isConnected()) {
+            try {
+                responseMsgLock.lock();
+                outputStream.onNext(responseMsg);
+            } finally {
+                responseMsgLock.unlock();
+            }
         }
     }