diff --git a/packages/fl_query/lib/src/core/client.dart b/packages/fl_query/lib/src/core/client.dart
index ea10f17..3baf9c7 100644
--- a/packages/fl_query/lib/src/core/client.dart
+++ b/packages/fl_query/lib/src/core/client.dart
@@ -35,6 +35,7 @@ class QueryClient {
           ),
         )
         .cast<DataType, ErrorType, KeyType>();
+    query.updateQueryFn(queryFn);
     cache.addQuery(query);
     return query;
   }
diff --git a/packages/fl_query/lib/src/core/query.dart b/packages/fl_query/lib/src/core/query.dart
index 0ad8f26..5043dce 100644
--- a/packages/fl_query/lib/src/core/query.dart
+++ b/packages/fl_query/lib/src/core/query.dart
@@ -153,8 +153,12 @@ class Query<DataType, ErrorType, KeyType>
   }
 
   void updateQueryFn(QueryFn<DataType> queryFn) {
+    if (state.queryFn == queryFn) return;
+    // updatedAt is updated with copyWith so storing it
+    // here to check if the query is stale later
+    final stale = state.isStale;
     state = state.copyWith(queryFn: queryFn);
-    if (state.isStale || refreshConfig.refreshOnQueryFnChange) {
+    if (stale || refreshConfig.refreshOnQueryFnChange) {
       refresh();
     }
   }