diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index b4fdb4e1..980288e9 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -338,6 +338,9 @@ export function waitFor(filter: string | string[] | FilterFn, callback: Callback
     else if (typeof filter !== "function")
         throw new Error("filter must be a string, string[] or function, got " + typeof filter);
 
+    const [existing, id] = find(filter!, { isIndirect: true, isWaitFor: true });
+    if (existing) return void callback(existing, id);
+
     subscriptions.set(filter, callback);
 }