diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java b/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java
index df867951..54295cdb 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java
@@ -114,7 +114,10 @@ public class BlockingHashMap<TKey, TValue> {
 					if (remainingTime > 0) {
 						TimeUnit.NANOSECONDS.timedWait(lock, remainingTime);
 						value = backingMap.get(key);
-					} 
+					} else {
+						// Timeout elapsed
+						break;
+					}
 				}
 			}
 		}