diff --git a/packages/solid-query/src/useBaseQuery.ts b/packages/solid-query/src/useBaseQuery.ts
index 773d0719e0..f748ea03cb 100644
--- a/packages/solid-query/src/useBaseQuery.ts
+++ b/packages/solid-query/src/useBaseQuery.ts
@@ -182,8 +182,11 @@ export function useBaseQuery<
     return obs.subscribe((result) => {
       observerResult = result
       queueMicrotask(() => {
-        if (unsubscribe) {
+        if (!unsubscribe || observer() !== obs) return
+        if (resolver || result.isLoading || (result.isFetching && result.isError)) {
           refetch()
+        } else {
+          setStateWithReconciliation(result)
         }
       })
     })