diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/DefaultEdqsRepository.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/DefaultEdqsRepository.java
index 88e4cc63d2..f020d28b7e 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/DefaultEdqsRepository.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/DefaultEdqsRepository.java
@@ -56,6 +56,10 @@ public class DefaultEdqsRepository implements EdqsRepository {
             repos.remove(event.getTenantId());
             statsService.reportRemoved(ObjectType.TENANT);
         } else {
+            if (event.getTenantId().equals(TenantId.SYS_TENANT_ID)) {
+                log.warn("Event for SYS tenant: {}", event);
+                return;
+            }
             get(event.getTenantId()).processEvent(event);
         }
     }