diff --git a/yarn-project/foundation/src/fifo/memory_fifo.ts b/yarn-project/foundation/src/fifo/memory_fifo.ts
index bcd0145fb58..18c9ee05b40 100644
--- a/yarn-project/foundation/src/fifo/memory_fifo.ts
+++ b/yarn-project/foundation/src/fifo/memory_fifo.ts
@@ -39,6 +39,10 @@ export class MemoryFifo<T> {
       return Promise.resolve(null);
     }
 
+    if (timeout === 0) {
+      return Promise.resolve(null);
+    }
+
     return new Promise<T | null>((resolve, reject) => {
       this.waiting.push(resolve);