diff --git a/packages/fl_query/lib/src/core/infinite_query.dart b/packages/fl_query/lib/src/core/infinite_query.dart
index 508535b..715638b 100644
--- a/packages/fl_query/lib/src/core/infinite_query.dart
+++ b/packages/fl_query/lib/src/core/infinite_query.dart
@@ -377,7 +377,7 @@ class InfiniteQuery<DataType, ErrorType, PageType>
     } else {
       Future.wait(
         state.pages.map((page) async {
-          if (page.isStale) {
+          if (page.isStale && page.error == null) {
             return await refresh(page.page);
           }
         }),
diff --git a/packages/fl_query/lib/src/core/query.dart b/packages/fl_query/lib/src/core/query.dart
index d45e405..4cea4d8 100644
--- a/packages/fl_query/lib/src/core/query.dart
+++ b/packages/fl_query/lib/src/core/query.dart
@@ -187,7 +187,7 @@ class Query<DataType, ErrorType>
   void updateQueryFn(QueryFn<DataType> queryFn) {
     if (_queryFn == queryFn) return;
     _queryFn = queryFn;
-    if (state.isStale || refreshConfig.refreshOnQueryFnChange) {
+    if ((state.isStale && !hasError) || refreshConfig.refreshOnQueryFnChange) {
       refresh();
     }
   }