diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/utils/HashSetDelayedBlockingQueue.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/HashSetDelayedBlockingQueue.java
index a7dcb81a..b4ff8dc7 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/utils/HashSetDelayedBlockingQueue.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/HashSetDelayedBlockingQueue.java
@@ -34,11 +34,9 @@ public class HashSetDelayedBlockingQueue<T> {
         synchronized (this) {
             if (_closed) throw new IllegalStateException("Adding to a queue that is closed!");
 
-            if (_set.containsKey(el))
+            if (_set.putIfAbsent(el, new SetElement<>(el, System.currentTimeMillis())) != null)
                 return false;
 
-            _set.put(el, new SetElement<>(el, System.currentTimeMillis()));
-
             this.notify();
             return true;
         }