diff --git a/src/queries/makeQueries.ts b/src/queries/makeQueries.ts
index b96430dd5..a698fa402 100644
--- a/src/queries/makeQueries.ts
+++ b/src/queries/makeQueries.ts
@@ -192,6 +192,10 @@ export function makeQueries<Predicate, Options>(
         ...waitForOptions
       }: WaitForOptions = {}
     ) {
+      const stackTraceError = new ErrorWithStack(
+        'STACK_TRACE_ERROR',
+        findAllFn
+      );
       const deprecatedWaitForOptions =
         extractDeprecatedWaitForOptions(queryOptions);
 
@@ -204,6 +208,7 @@ export function makeQueries<Predicate, Options>(
         {
           ...deprecatedWaitForOptions,
           ...waitForOptions,
+          stackTraceError,
           onTimeout,
         }
       );
@@ -219,6 +224,7 @@ export function makeQueries<Predicate, Options>(
         ...waitForOptions
       }: WaitForOptions = {}
     ) {
+      const stackTraceError = new ErrorWithStack('STACK_TRACE_ERROR', findFn);
       const deprecatedWaitForOptions =
         extractDeprecatedWaitForOptions(queryOptions);
 
@@ -231,6 +237,7 @@ export function makeQueries<Predicate, Options>(
         {
           ...deprecatedWaitForOptions,
           ...waitForOptions,
+          stackTraceError,
           onTimeout,
         }
       );