diff --git a/gb-command/src/main/java/com/g2forge/gearbox/command/proxy/result/StreamResultSupplier.java b/gb-command/src/main/java/com/g2forge/gearbox/command/proxy/result/StreamResultSupplier.java
index 1c1fa22..074df2a 100644
--- a/gb-command/src/main/java/com/g2forge/gearbox/command/proxy/result/StreamResultSupplier.java
+++ b/gb-command/src/main/java/com/g2forge/gearbox/command/proxy/result/StreamResultSupplier.java
@@ -156,7 +156,7 @@ protected void run() {
 					while (queue.size() >= capacity) {
 						if (!isOpen()) return;
 						synchronized (queue) {
-							queue.wait();
+							if (queue.size() >= capacity) queue.wait(1000);
 						}
 					}