diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
index 665edc0ca9..77a3480f0a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
@@ -28,10 +28,14 @@ import java.util.UUID;
 public final class TenantId extends UUIDBased implements EntityId {
 
     @JsonIgnore
-    public static final TenantId SYS_TENANT_ID = TenantId.fromUUID(EntityId.NULL_UUID);
+    public static final TenantId SYS_TENANT_ID = new TenantId(EntityId.NULL_UUID);
 
     static final ConcurrentReferenceHashMap<UUID, TenantId> tenants = new ConcurrentReferenceHashMap<>(16, ReferenceType.SOFT);
 
+    static {
+        tenants.put(SYS_TENANT_ID.getId(), SYS_TENANT_ID);
+    }
+
     private static final long serialVersionUID = 1L;
 
     @JsonCreator