diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
index e9c93d0396..09df0f4a4a 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
@@ -28,7 +28,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.DataConstants;
-import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -180,7 +179,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
     @Override
     public void onEdgeEvent(TenantId tenantId, EdgeId edgeId) {
         log.trace("[{}] onEdgeEvent [{}]", tenantId, edgeId.getId());
-        if (!sessionNewEvents.get(edgeId)) {
+        if (Boolean.FALSE.equals(sessionNewEvents.get(edgeId))) {
             log.trace("[{}] set session new events flag to true [{}]", tenantId, edgeId.getId());
             sessionNewEvents.put(edgeId, true);
         }
@@ -213,7 +212,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
         if (sessions.containsKey(edgeId)) {
             ScheduledFuture<?> schedule = scheduler.schedule(() -> {
                 try {
-                    if (sessionNewEvents.get(edgeId)) {
+                    if (Boolean.TRUE.equals(sessionNewEvents.get(edgeId))) {
                         log.trace("[{}] Set session new events flag to false", edgeId.getId());
                         sessionNewEvents.put(edgeId, false);
                         session.processEdgeEvents();