diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/util/VersionsStore.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/util/VersionsStore.java
index c8c8f76761..f348e9cf9e 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/util/VersionsStore.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/util/VersionsStore.java
@@ -54,11 +54,15 @@ public class VersionsStore {
 
     private void startCleanupTask() {
         cleaner.scheduleAtFixedRate(() -> {
-            long now = System.currentTimeMillis();
-            for (Map.Entry<EdqsObjectKey, TimedValue> entry : versions.entrySet()) {
-                if (now - entry.getValue().lastUpdated > expirationMillis) {
-                    versions.remove(entry.getKey(), entry.getValue());
+            try {
+                long now = System.currentTimeMillis();
+                for (Map.Entry<EdqsObjectKey, TimedValue> entry : versions.entrySet()) {
+                    if (now - entry.getValue().lastUpdated > expirationMillis) {
+                        versions.remove(entry.getKey(), entry.getValue());
+                    }
                 }
+            } catch (Exception e) {
+                log.error("Cleanup task failed", e);
             }
         }, expirationMillis, expirationMillis, TimeUnit.MILLISECONDS);
     }