diff --git a/direct/core/src/main/java/cz/o2/proxima/direct/core/view/TimeBoundedVersionedCache.java b/direct/core/src/main/java/cz/o2/proxima/direct/core/view/TimeBoundedVersionedCache.java
index 5753a2aea..875c9a050 100644
--- a/direct/core/src/main/java/cz/o2/proxima/direct/core/view/TimeBoundedVersionedCache.java
+++ b/direct/core/src/main/java/cz/o2/proxima/direct/core/view/TimeBoundedVersionedCache.java
@@ -221,7 +221,7 @@ synchronized boolean put(
             }
           }
           long first;
-          while ((first = valueMap.firstKey()) + keepDuration < stamp) {
+          while (!valueMap.isEmpty() && (first = valueMap.firstKey()) + keepDuration < stamp) {
             valueMap.remove(first);
           }
           return attrMap;