diff --git a/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java b/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
index 36af9b212e..119b011adb 100644
--- a/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
+++ b/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
@@ -162,7 +162,9 @@ public class EdgeGrpcClient implements EdgeRpcClient {
     public void disconnect(boolean onError) throws InterruptedException {
         if (!onError) {
             try {
-                inputStream.onCompleted();
+                if (inputStream != null) {
+                    inputStream.onCompleted();
+                }
             } catch (Exception e) {
                 log.error("Exception during onCompleted", e);
             }