diff --git a/docs/framework/react/guides/infinite-queries.md b/docs/framework/react/guides/infinite-queries.md
index 6dc1e0baca3..04e4ac7eea7 100644
--- a/docs/framework/react/guides/infinite-queries.md
+++ b/docs/framework/react/guides/infinite-queries.md
@@ -82,7 +82,7 @@ function Projects() {
       <div>
         <button
           onClick={() => fetchNextPage()}
-          disabled={!hasNextPage || isFetchingNextPage}
+          disabled={!hasNextPage || isFetching}
         >
           {isFetchingNextPage
             ? 'Loading more...'
@@ -110,7 +110,7 @@ To ensure a seamless querying process without conflicts, it's highly recommended
 [//]: # 'Example1'
 
 ```jsx
-<List onEndReached={() => !isFetchingNextPage && fetchNextPage()} />
+<List onEndReached={() => hasNextPage && !isFetching && fetchNextPage()} />
 ```
 
 [//]: # 'Example1'
diff --git a/examples/angular/auto-refetching/package.json b/examples/angular/auto-refetching/package.json
index 6b882c5407b..caa859a1bf0 100644
--- a/examples/angular/auto-refetching/package.json
+++ b/examples/angular/auto-refetching/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0-rc.0",
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/basic-persister/package.json b/examples/angular/basic-persister/package.json
index 7a43ea3fed8..a00b6300b92 100644
--- a/examples/angular/basic-persister/package.json
+++ b/examples/angular/basic-persister/package.json
@@ -14,9 +14,9 @@
     "@angular/core": "^20.0.0-rc.0",
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "@tanstack/angular-query-persist-client": "^5.62.7",
-    "@tanstack/query-sync-storage-persister": "^5.76.1",
+    "@tanstack/query-sync-storage-persister": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/basic/package.json b/examples/angular/basic/package.json
index 84ae9631dd2..dba7c5132bb 100644
--- a/examples/angular/basic/package.json
+++ b/examples/angular/basic/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0-rc.0",
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/devtools-panel/package.json b/examples/angular/devtools-panel/package.json
index 9321d081ad9..4f5cef28996 100644
--- a/examples/angular/devtools-panel/package.json
+++ b/examples/angular/devtools-panel/package.json
@@ -15,8 +15,8 @@
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
     "@angular/router": "^20.0.0-rc.0",
-    "@tanstack/angular-query-devtools-experimental": "^5.76.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-devtools-experimental": "^5.76.2",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/infinite-query-with-max-pages/package.json b/examples/angular/infinite-query-with-max-pages/package.json
index efbc0b450f9..20335e7115e 100644
--- a/examples/angular/infinite-query-with-max-pages/package.json
+++ b/examples/angular/infinite-query-with-max-pages/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0-rc.0",
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/optimistic-updates/package.json b/examples/angular/optimistic-updates/package.json
index 716007496cd..a3263ba4072 100644
--- a/examples/angular/optimistic-updates/package.json
+++ b/examples/angular/optimistic-updates/package.json
@@ -15,7 +15,7 @@
     "@angular/forms": "^20.0.0-rc.0",
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/pagination/package.json b/examples/angular/pagination/package.json
index 4f4810f7a38..85376001feb 100644
--- a/examples/angular/pagination/package.json
+++ b/examples/angular/pagination/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0-rc.0",
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/query-options-from-a-service/package.json b/examples/angular/query-options-from-a-service/package.json
index db0f3592928..212df209399 100644
--- a/examples/angular/query-options-from-a-service/package.json
+++ b/examples/angular/query-options-from-a-service/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
     "@angular/router": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/router/package.json b/examples/angular/router/package.json
index 2d4b1bbb0ea..fb77adcf4ec 100644
--- a/examples/angular/router/package.json
+++ b/examples/angular/router/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
     "@angular/router": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/rxjs/package.json b/examples/angular/rxjs/package.json
index f461ebf66fe..9726978055e 100644
--- a/examples/angular/rxjs/package.json
+++ b/examples/angular/rxjs/package.json
@@ -15,7 +15,7 @@
     "@angular/forms": "^20.0.0-rc.0",
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/simple/package.json b/examples/angular/simple/package.json
index 6f56b47749a..90ce0e359f9 100644
--- a/examples/angular/simple/package.json
+++ b/examples/angular/simple/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0-rc.0",
     "@angular/platform-browser": "^20.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^20.0.0-rc.0",
-    "@tanstack/angular-query-experimental": "^5.76.0",
+    "@tanstack/angular-query-experimental": "^5.76.2",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/react/algolia/package.json b/examples/react/algolia/package.json
index 4d9268fee5b..904408314ff 100644
--- a/examples/react/algolia/package.json
+++ b/examples/react/algolia/package.json
@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@algolia/client-search": "5.2.1",
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/auto-refetching/package.json b/examples/react/auto-refetching/package.json
index 2991c57344c..fb61f390725 100644
--- a/examples/react/auto-refetching/package.json
+++ b/examples/react/auto-refetching/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/examples/react/basic-graphql-request/package.json b/examples/react/basic-graphql-request/package.json
index 42cc90ccdc6..78b396fe7c0 100644
--- a/examples/react/basic-graphql-request/package.json
+++ b/examples/react/basic-graphql-request/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.2",
     "react": "^19.0.0",
diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json
index 39e20b23964..614b99e2961 100644
--- a/examples/react/basic/package.json
+++ b/examples/react/basic/package.json
@@ -9,10 +9,10 @@
     "test:eslint": "eslint ./src"
   },
   "dependencies": {
-    "@tanstack/query-sync-storage-persister": "^5.76.1",
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
-    "@tanstack/react-query-persist-client": "^5.76.1",
+    "@tanstack/query-sync-storage-persister": "^5.76.2",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
+    "@tanstack/react-query-persist-client": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/chat/package.json b/examples/react/chat/package.json
index 4ee09ad95ff..bdba4bf5998 100644
--- a/examples/react/chat/package.json
+++ b/examples/react/chat/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/default-query-function/package.json b/examples/react/default-query-function/package.json
index 2c324948636..009e9acf533 100644
--- a/examples/react/default-query-function/package.json
+++ b/examples/react/default-query-function/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/devtools-panel/package.json b/examples/react/devtools-panel/package.json
index da1fce84a98..f4ad74e069f 100644
--- a/examples/react/devtools-panel/package.json
+++ b/examples/react/devtools-panel/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/eslint-legacy/package.json b/examples/react/eslint-legacy/package.json
index efb4f946faf..6ec2e670b72 100644
--- a/examples/react/eslint-legacy/package.json
+++ b/examples/react/eslint-legacy/package.json
@@ -9,10 +9,10 @@
     "test:eslint": "ESLINT_USE_FLAT_CONFIG=false eslint ./src/**/*.tsx"
   },
   "dependencies": {
-    "@tanstack/query-sync-storage-persister": "^5.76.1",
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
-    "@tanstack/react-query-persist-client": "^5.76.1",
+    "@tanstack/query-sync-storage-persister": "^5.76.2",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
+    "@tanstack/react-query-persist-client": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/infinite-query-with-max-pages/package.json b/examples/react/infinite-query-with-max-pages/package.json
index 5b7b5c0478c..a1100912e9f 100644
--- a/examples/react/infinite-query-with-max-pages/package.json
+++ b/examples/react/infinite-query-with-max-pages/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/examples/react/load-more-infinite-scroll/package.json b/examples/react/load-more-infinite-scroll/package.json
index 1b5695d17c6..b21851b947d 100644
--- a/examples/react/load-more-infinite-scroll/package.json
+++ b/examples/react/load-more-infinite-scroll/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/react/nextjs-app-prefetching/package.json b/examples/react/nextjs-app-prefetching/package.json
index 78a715dc97c..7979a347828 100644
--- a/examples/react/nextjs-app-prefetching/package.json
+++ b/examples/react/nextjs-app-prefetching/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
diff --git a/examples/react/nextjs-suspense-streaming/package.json b/examples/react/nextjs-suspense-streaming/package.json
index 45bd32b8302..82d29ca6001 100644
--- a/examples/react/nextjs-suspense-streaming/package.json
+++ b/examples/react/nextjs-suspense-streaming/package.json
@@ -8,9 +8,9 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
-    "@tanstack/react-query-next-experimental": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
+    "@tanstack/react-query-next-experimental": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/examples/react/nextjs/package.json b/examples/react/nextjs/package.json
index bce3ec0f574..fc47e596272 100644
--- a/examples/react/nextjs/package.json
+++ b/examples/react/nextjs/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/examples/react/offline/package.json b/examples/react/offline/package.json
index 2952735f0d4..6335e6c423f 100644
--- a/examples/react/offline/package.json
+++ b/examples/react/offline/package.json
@@ -8,11 +8,11 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/query-sync-storage-persister": "^5.76.1",
+    "@tanstack/query-sync-storage-persister": "^5.76.2",
     "@tanstack/react-location": "^3.7.4",
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
-    "@tanstack/react-query-persist-client": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
+    "@tanstack/react-query-persist-client": "^5.76.2",
     "msw": "^2.6.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
diff --git a/examples/react/optimistic-updates-cache/package.json b/examples/react/optimistic-updates-cache/package.json
index f126b5266aa..d11149c3793 100755
--- a/examples/react/optimistic-updates-cache/package.json
+++ b/examples/react/optimistic-updates-cache/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/examples/react/optimistic-updates-ui/package.json b/examples/react/optimistic-updates-ui/package.json
index e6039eee5d1..fc48f9dbaea 100755
--- a/examples/react/optimistic-updates-ui/package.json
+++ b/examples/react/optimistic-updates-ui/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/examples/react/pagination/package.json b/examples/react/pagination/package.json
index 2ae343a599a..5e817f85820 100644
--- a/examples/react/pagination/package.json
+++ b/examples/react/pagination/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/examples/react/playground/package.json b/examples/react/playground/package.json
index 0cadee5a5ca..e29b2db3e29 100644
--- a/examples/react/playground/package.json
+++ b/examples/react/playground/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/prefetching/package.json b/examples/react/prefetching/package.json
index 9ea47c8602d..f63837f9a15 100644
--- a/examples/react/prefetching/package.json
+++ b/examples/react/prefetching/package.json
@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "next": "^15.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/examples/react/react-native/package.json b/examples/react/react-native/package.json
index 2ffca26df42..cfedee4ad36 100644
--- a/examples/react/react-native/package.json
+++ b/examples/react/react-native/package.json
@@ -14,8 +14,8 @@
     "@react-native-community/netinfo": "^11.4.1",
     "@react-navigation/native": "^6.1.18",
     "@react-navigation/stack": "^6.4.1",
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "expo": "^52.0.11",
     "expo-constants": "^17.0.3",
     "expo-status-bar": "^2.0.0",
diff --git a/examples/react/react-router/package.json b/examples/react/react-router/package.json
index 6184950aa17..fed5a6ac551 100644
--- a/examples/react/react-router/package.json
+++ b/examples/react/react-router/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "localforage": "^1.10.0",
     "match-sorter": "^6.3.4",
     "react": "^19.0.0",
diff --git a/examples/react/rick-morty/package.json b/examples/react/rick-morty/package.json
index 29f7f45c17e..5a52483c4c9 100644
--- a/examples/react/rick-morty/package.json
+++ b/examples/react/rick-morty/package.json
@@ -12,8 +12,8 @@
     "@emotion/styled": "^11.13.5",
     "@mui/material": "^6.1.8",
     "@mui/styles": "^6.1.8",
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-router": "^6.25.1",
diff --git a/examples/react/shadow-dom/package.json b/examples/react/shadow-dom/package.json
index 8a57d30c52d..37b82802bb3 100644
--- a/examples/react/shadow-dom/package.json
+++ b/examples/react/shadow-dom/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/simple/package.json b/examples/react/simple/package.json
index 8feb4b44a8b..604ba930bfb 100644
--- a/examples/react/simple/package.json
+++ b/examples/react/simple/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
diff --git a/examples/react/star-wars/package.json b/examples/react/star-wars/package.json
index 809f42f24bc..ca00126721a 100644
--- a/examples/react/star-wars/package.json
+++ b/examples/react/star-wars/package.json
@@ -12,8 +12,8 @@
     "@emotion/styled": "^11.13.5",
     "@mui/material": "^6.1.8",
     "@mui/styles": "^6.1.8",
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-router": "^6.25.1",
diff --git a/examples/react/suspense/package.json b/examples/react/suspense/package.json
index fcb1b9f7501..ce783c7e21c 100644
--- a/examples/react/suspense/package.json
+++ b/examples/react/suspense/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-query-devtools": "^5.76.1",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
     "font-awesome": "^4.7.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
diff --git a/examples/solid/astro/package.json b/examples/solid/astro/package.json
index c20dead5492..402195782ae 100644
--- a/examples/solid/astro/package.json
+++ b/examples/solid/astro/package.json
@@ -15,8 +15,8 @@
     "@astrojs/solid-js": "^5.0.7",
     "@astrojs/tailwind": "^6.0.2",
     "@astrojs/vercel": "^8.1.3",
-    "@tanstack/solid-query": "^5.76.0",
-    "@tanstack/solid-query-devtools": "^5.76.0",
+    "@tanstack/solid-query": "^5.76.2",
+    "@tanstack/solid-query-devtools": "^5.76.2",
     "astro": "^5.5.6",
     "solid-js": "^1.9.5",
     "tailwindcss": "^3.4.7",
diff --git a/examples/solid/basic-graphql-request/package.json b/examples/solid/basic-graphql-request/package.json
index 6cb24cae6ca..53d58c20050 100644
--- a/examples/solid/basic-graphql-request/package.json
+++ b/examples/solid/basic-graphql-request/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.76.0",
-    "@tanstack/solid-query-devtools": "^5.76.0",
+    "@tanstack/solid-query": "^5.76.2",
+    "@tanstack/solid-query-devtools": "^5.76.2",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.2",
     "solid-js": "^1.9.5"
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
index faf268739ec..7eab7c7b491 100644
--- a/examples/solid/basic/package.json
+++ b/examples/solid/basic/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.76.0",
-    "@tanstack/solid-query-devtools": "^5.76.0",
+    "@tanstack/solid-query": "^5.76.2",
+    "@tanstack/solid-query-devtools": "^5.76.2",
     "solid-js": "^1.9.5"
   },
   "devDependencies": {
diff --git a/examples/solid/default-query-function/package.json b/examples/solid/default-query-function/package.json
index 973e92a5321..55eaeeea76e 100644
--- a/examples/solid/default-query-function/package.json
+++ b/examples/solid/default-query-function/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.76.0",
-    "@tanstack/solid-query-devtools": "^5.76.0",
+    "@tanstack/solid-query": "^5.76.2",
+    "@tanstack/solid-query-devtools": "^5.76.2",
     "solid-js": "^1.9.5"
   },
   "devDependencies": {
diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json
index f6a374bc46e..c9b3e219449 100644
--- a/examples/solid/simple/package.json
+++ b/examples/solid/simple/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.76.0",
-    "@tanstack/solid-query-devtools": "^5.76.0",
+    "@tanstack/solid-query": "^5.76.2",
+    "@tanstack/solid-query-devtools": "^5.76.2",
     "solid-js": "^1.9.5"
   },
   "devDependencies": {
diff --git a/examples/solid/solid-start-streaming/package.json b/examples/solid/solid-start-streaming/package.json
index 7da08599ead..320e96d6d6e 100644
--- a/examples/solid/solid-start-streaming/package.json
+++ b/examples/solid/solid-start-streaming/package.json
@@ -12,8 +12,8 @@
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.15.3",
     "@solidjs/start": "^1.1.3",
-    "@tanstack/solid-query": "^5.76.0",
-    "@tanstack/solid-query-devtools": "^5.76.0",
+    "@tanstack/solid-query": "^5.76.2",
+    "@tanstack/solid-query-devtools": "^5.76.2",
     "solid-js": "^1.9.5",
     "vinxi": "^0.5.3"
   },
diff --git a/examples/svelte/auto-refetching/package.json b/examples/svelte/auto-refetching/package.json
index de0e6ac8fad..e400f6bf32d 100644
--- a/examples/svelte/auto-refetching/package.json
+++ b/examples/svelte/auto-refetching/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/svelte-query": "^5.76.0",
-    "@tanstack/svelte-query-devtools": "^5.76.0"
+    "@tanstack/svelte-query": "^5.76.2",
+    "@tanstack/svelte-query-devtools": "^5.76.2"
   },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^6.0.0",
diff --git a/examples/svelte/basic/package.json b/examples/svelte/basic/package.json
index 7417f1edb64..3836a38b750 100644
--- a/examples/svelte/basic/package.json
+++ b/examples/svelte/basic/package.json
@@ -8,10 +8,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/query-sync-storage-persister": "^5.76.1",
-    "@tanstack/svelte-query": "^5.76.0",
-    "@tanstack/svelte-query-devtools": "^5.76.0",
-    "@tanstack/svelte-query-persist-client": "^5.76.1"
+    "@tanstack/query-sync-storage-persister": "^5.76.2",
+    "@tanstack/svelte-query": "^5.76.2",
+    "@tanstack/svelte-query-devtools": "^5.76.2",
+    "@tanstack/svelte-query-persist-client": "^5.76.2"
   },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^6.0.0",
diff --git a/examples/svelte/load-more-infinite-scroll/package.json b/examples/svelte/load-more-infinite-scroll/package.json
index 08a5fd7262a..0d1e1b6b565 100644
--- a/examples/svelte/load-more-infinite-scroll/package.json
+++ b/examples/svelte/load-more-infinite-scroll/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/svelte-query": "^5.76.0",
-    "@tanstack/svelte-query-devtools": "^5.76.0"
+    "@tanstack/svelte-query": "^5.76.2",
+    "@tanstack/svelte-query-devtools": "^5.76.2"
   },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^6.0.0",
diff --git a/examples/svelte/optimistic-updates/package.json b/examples/svelte/optimistic-updates/package.json
index ad40048f0fe..8eb4aba1fdd 100644
--- a/examples/svelte/optimistic-updates/package.json
+++ b/examples/svelte/optimistic-updates/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/svelte-query": "^5.76.0",
-    "@tanstack/svelte-query-devtools": "^5.76.0"
+    "@tanstack/svelte-query": "^5.76.2",
+    "@tanstack/svelte-query-devtools": "^5.76.2"
   },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^6.0.0",
diff --git a/examples/svelte/playground/package.json b/examples/svelte/playground/package.json
index 20842a10c81..70245f9adb8 100644
--- a/examples/svelte/playground/package.json
+++ b/examples/svelte/playground/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/svelte-query": "^5.76.0",
-    "@tanstack/svelte-query-devtools": "^5.76.0"
+    "@tanstack/svelte-query": "^5.76.2",
+    "@tanstack/svelte-query-devtools": "^5.76.2"
   },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^6.0.0",
diff --git a/examples/svelte/simple/package.json b/examples/svelte/simple/package.json
index f23bdadb530..b7a4a7ce1b2 100644
--- a/examples/svelte/simple/package.json
+++ b/examples/svelte/simple/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/svelte-query": "^5.76.0",
-    "@tanstack/svelte-query-devtools": "^5.76.0"
+    "@tanstack/svelte-query": "^5.76.2",
+    "@tanstack/svelte-query-devtools": "^5.76.2"
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
diff --git a/examples/svelte/ssr/package.json b/examples/svelte/ssr/package.json
index 36af9e83d02..b9c5d2ba8f3 100644
--- a/examples/svelte/ssr/package.json
+++ b/examples/svelte/ssr/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/svelte-query": "^5.76.0",
-    "@tanstack/svelte-query-devtools": "^5.76.0"
+    "@tanstack/svelte-query": "^5.76.2",
+    "@tanstack/svelte-query-devtools": "^5.76.2"
   },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^6.0.0",
diff --git a/examples/svelte/star-wars/package.json b/examples/svelte/star-wars/package.json
index 058bfd1bc6f..07b1153cb00 100644
--- a/examples/svelte/star-wars/package.json
+++ b/examples/svelte/star-wars/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/svelte-query": "^5.76.0",
-    "@tanstack/svelte-query-devtools": "^5.76.0"
+    "@tanstack/svelte-query": "^5.76.2",
+    "@tanstack/svelte-query-devtools": "^5.76.2"
   },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^6.0.0",
diff --git a/examples/vue/2.6-basic/package.json b/examples/vue/2.6-basic/package.json
index f52badf5630..75e0e4415a2 100644
--- a/examples/vue/2.6-basic/package.json
+++ b/examples/vue/2.6-basic/package.json
@@ -8,7 +8,7 @@
     "_preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/vue-query": "^5.76.0",
+    "@tanstack/vue-query": "^5.76.2",
     "@vue/composition-api": "1.7.2",
     "vue": "2.6.14",
     "vue-template-compiler": "2.6.14"
diff --git a/examples/vue/2.7-basic/package.json b/examples/vue/2.7-basic/package.json
index 47ed55fd72e..b1f5e61f227 100644
--- a/examples/vue/2.7-basic/package.json
+++ b/examples/vue/2.7-basic/package.json
@@ -8,7 +8,7 @@
     "_serve": "vite preview"
   },
   "dependencies": {
-    "@tanstack/vue-query": "^5.76.0",
+    "@tanstack/vue-query": "^5.76.2",
     "vue": "2.7.16",
     "vue-template-compiler": "2.7.16"
   },
diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json
index 76b5476bfb9..bd98a3a19c5 100644
--- a/examples/vue/basic/package.json
+++ b/examples/vue/basic/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/vue-query": "^5.76.0",
-    "@tanstack/vue-query-devtools": "^5.76.0",
+    "@tanstack/vue-query": "^5.76.2",
+    "@tanstack/vue-query-devtools": "^5.76.2",
     "vue": "^3.4.27"
   },
   "devDependencies": {
diff --git a/examples/vue/dependent-queries/package.json b/examples/vue/dependent-queries/package.json
index dfdb5f46b28..49579af48c2 100644
--- a/examples/vue/dependent-queries/package.json
+++ b/examples/vue/dependent-queries/package.json
@@ -8,7 +8,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/vue-query": "^5.76.0",
+    "@tanstack/vue-query": "^5.76.2",
     "vue": "^3.4.27"
   },
   "devDependencies": {
diff --git a/examples/vue/nuxt3/package.json b/examples/vue/nuxt3/package.json
index 257e905128c..fa74984888c 100644
--- a/examples/vue/nuxt3/package.json
+++ b/examples/vue/nuxt3/package.json
@@ -7,7 +7,7 @@
     "_start": "node .output/server/index.mjs"
   },
   "dependencies": {
-    "@tanstack/vue-query": "^5.76.0"
+    "@tanstack/vue-query": "^5.76.2"
   },
   "devDependencies": {
     "nuxt": "^3.12.4"
diff --git a/examples/vue/persister/package.json b/examples/vue/persister/package.json
index a80c0487c77..38a348fa768 100644
--- a/examples/vue/persister/package.json
+++ b/examples/vue/persister/package.json
@@ -8,10 +8,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/query-core": "^5.76.0",
-    "@tanstack/query-persist-client-core": "^5.76.1",
-    "@tanstack/query-sync-storage-persister": "^5.76.1",
-    "@tanstack/vue-query": "^5.76.0",
+    "@tanstack/query-core": "^5.76.2",
+    "@tanstack/query-persist-client-core": "^5.76.2",
+    "@tanstack/query-sync-storage-persister": "^5.76.2",
+    "@tanstack/vue-query": "^5.76.2",
     "idb-keyval": "^6.2.1",
     "vue": "^3.4.27"
   },
diff --git a/examples/vue/simple/package.json b/examples/vue/simple/package.json
index 390c587ebfe..71c8f22e6a6 100644
--- a/examples/vue/simple/package.json
+++ b/examples/vue/simple/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/vue-query": "^5.76.0",
-    "@tanstack/vue-query-devtools": "^5.76.0",
+    "@tanstack/vue-query": "^5.76.2",
+    "@tanstack/vue-query-devtools": "^5.76.2",
     "vue": "^3.4.27"
   },
   "devDependencies": {
diff --git a/packages/angular-query-devtools-experimental/package.json b/packages/angular-query-devtools-experimental/package.json
index 6cdecf82c35..4af204cb5de 100644
--- a/packages/angular-query-devtools-experimental/package.json
+++ b/packages/angular-query-devtools-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/angular-query-devtools-experimental",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "Developer tools to interact with and visualize the TanStack/angular-query cache",
   "author": "Arnoud de Vries",
   "license": "MIT",
diff --git a/packages/angular-query-experimental/package.json b/packages/angular-query-experimental/package.json
index bf61f9683d7..d26c6fa1861 100644
--- a/packages/angular-query-experimental/package.json
+++ b/packages/angular-query-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/angular-query-experimental",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "Signals for managing, caching and syncing asynchronous and remote data in Angular",
   "author": "Arnoud de Vries",
   "license": "MIT",
diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json
index 7a5cc688bdc..e84468c9450 100644
--- a/packages/query-async-storage-persister/package.json
+++ b/packages/query-async-storage-persister/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-async-storage-persister",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "A persister for asynchronous storages, to be used with TanStack/Query",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json
index 29715a094b5..37650a0eeb7 100644
--- a/packages/query-broadcast-client-experimental/package.json
+++ b/packages/query-broadcast-client-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-broadcast-client-experimental",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "An experimental plugin to for broadcasting the state of your queryClient between browser tabs/windows",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/query-core/package.json b/packages/query-core/package.json
index 00cff281256..c0c8edae973 100644
--- a/packages/query-core/package.json
+++ b/packages/query-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-core",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "The framework agnostic core that powers TanStack Query",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/query-core/src/__tests__/hydration.test.tsx b/packages/query-core/src/__tests__/hydration.test.tsx
index 353d5c1dcb9..5582e9da16d 100644
--- a/packages/query-core/src/__tests__/hydration.test.tsx
+++ b/packages/query-core/src/__tests__/hydration.test.tsx
@@ -473,10 +473,12 @@ describe('dehydration and rehydration', () => {
     const serverAddTodo = vi
       .fn()
       .mockImplementation(() => Promise.reject(new Error('offline')))
-    const serverOnMutate = vi.fn().mockImplementation((variables) => {
-      const optimisticTodo = { id: 1, text: variables.text }
-      return { optimisticTodo }
-    })
+    const serverOnMutate = vi
+      .fn()
+      .mockImplementation((variables: { text: string }) => {
+        const optimisticTodo = { id: 1, text: variables.text }
+        return { optimisticTodo }
+      })
     const serverOnSuccess = vi.fn()
 
     const serverClient = new QueryClient()
@@ -511,13 +513,17 @@ describe('dehydration and rehydration', () => {
     const parsed = JSON.parse(stringified)
     const client = new QueryClient()
 
-    const clientAddTodo = vi.fn().mockImplementation((variables) => {
-      return { id: 2, text: variables.text }
-    })
-    const clientOnMutate = vi.fn().mockImplementation((variables) => {
-      const optimisticTodo = { id: 1, text: variables.text }
-      return { optimisticTodo }
-    })
+    const clientAddTodo = vi
+      .fn()
+      .mockImplementation((variables: { text: string }) => {
+        return { id: 2, text: variables.text }
+      })
+    const clientOnMutate = vi
+      .fn()
+      .mockImplementation((variables: { text: string }) => {
+        const optimisticTodo = { id: 1, text: variables.text }
+        return { optimisticTodo }
+      })
     const clientOnSuccess = vi.fn()
 
     client.setMutationDefaults(['addTodo'], {
@@ -1116,6 +1122,60 @@ describe('dehydration and rehydration', () => {
     serverQueryClient.clear()
   })
 
+  test('should not overwrite query in cache if existing query is newer (with promise)', async () => {
+    // --- server ---
+
+    const serverQueryClient = new QueryClient({
+      defaultOptions: {
+        dehydrate: {
+          shouldDehydrateQuery: () => true,
+        },
+      },
+    })
+
+    const promise = serverQueryClient.prefetchQuery({
+      queryKey: ['data'],
+      queryFn: async () => {
+        await sleep(10)
+        return 'server data'
+      },
+    })
+
+    const dehydrated = dehydrate(serverQueryClient)
+
+    await vi.advanceTimersByTimeAsync(10)
+    await promise
+
+    // Pretend the output of this server part is cached for a long time
+
+    // --- client ---
+
+    await vi.advanceTimersByTimeAsync(10_000) // Arbitrary time in the future
+
+    const clientQueryClient = new QueryClient()
+
+    clientQueryClient.setQueryData(['data'], 'newer data', {
+      updatedAt: Date.now(),
+    })
+
+    hydrate(clientQueryClient, dehydrated)
+
+    // If the query was hydrated in error, it would still take some time for it
+    // to end up in the cache, so for the test to fail properly on regressions,
+    // wait for the fetchStatus to be idle
+    await vi.waitFor(() =>
+      expect(clientQueryClient.getQueryState(['data'])?.fetchStatus).toBe(
+        'idle',
+      ),
+    )
+    await vi.waitFor(() =>
+      expect(clientQueryClient.getQueryData(['data'])).toBe('newer data'),
+    )
+
+    clientQueryClient.clear()
+    serverQueryClient.clear()
+  })
+
   test('should overwrite data when a new promise is streamed in', async () => {
     const serializeDataMock = vi.fn((data: any) => data)
     const deserializeDataMock = vi.fn((data: any) => data)
@@ -1291,4 +1351,55 @@ describe('dehydration and rehydration', () => {
     process.env.NODE_ENV = originalNodeEnv
     consoleMock.mockRestore()
   })
+
+  // When React hydrates promises across RSC/client boundaries, it passes
+  // them as special ReactPromise types. There are situations where the
+  // promise might have time to resolve before we end up hydrating it, in
+  // which case React will have made it a special synchronous thenable where
+  // .then() resolves immediately.
+  // In these cases it's important we hydrate the data synchronously, or else
+  // the data in the cache wont match the content that was rendered on the server.
+  // What can end up happening otherwise is that the content is visible from the
+  // server, but the client renders a Suspense fallback, only to immediately show
+  // the data again.
+  test('should rehydrate synchronous thenable immediately', async () => {
+    // --- server ---
+
+    const serverQueryClient = new QueryClient({
+      defaultOptions: {
+        dehydrate: {
+          shouldDehydrateQuery: () => true,
+        },
+      },
+    })
+    const originalPromise = serverQueryClient.prefetchQuery({
+      queryKey: ['data'],
+      queryFn: () => null,
+    })
+
+    const dehydrated = dehydrate(serverQueryClient)
+
+    // --- server end ---
+
+    // Simulate a synchronous thenable
+    // @ts-expect-error
+    dehydrated.queries[0].promise.then = (cb) => {
+      cb?.('server data')
+    }
+
+    // --- client ---
+
+    const clientQueryClient = new QueryClient()
+    hydrate(clientQueryClient, dehydrated)
+
+    // If data is already resolved, it should end up in the cache immediately
+    expect(clientQueryClient.getQueryData(['data'])).toBe('server data')
+
+    // Need to await the original promise or else it will get a cancellation
+    // error and test will fail
+    await originalPromise
+
+    clientQueryClient.clear()
+    serverQueryClient.clear()
+  })
 })
diff --git a/packages/query-core/src/hydration.ts b/packages/query-core/src/hydration.ts
index 39c581b63ce..268f9f3d988 100644
--- a/packages/query-core/src/hydration.ts
+++ b/packages/query-core/src/hydration.ts
@@ -1,3 +1,4 @@
+import { tryResolveSync } from './thenable'
 import type {
   DefaultError,
   MutationKey,
@@ -46,6 +47,10 @@ interface DehydratedQuery {
   state: QueryState
   promise?: Promise<unknown>
   meta?: QueryMeta
+  // This is only optional because older versions of Query might have dehydrated
+  // without it which we need to handle for backwards compatibility.
+  // This should be changed to required in the future.
+  dehydratedAt?: number
 }
 
 export interface DehydratedState {
@@ -74,6 +79,7 @@ function dehydrateQuery(
   shouldRedactErrors: (error: unknown) => boolean,
 ): DehydratedQuery {
   return {
+    dehydratedAt: Date.now(),
     state: {
       ...query.state,
       ...(query.state.data !== undefined && {
@@ -189,52 +195,73 @@ export function hydrate(
     )
   })
 
-  queries.forEach(({ queryKey, state, queryHash, meta, promise }) => {
-    let query = queryCache.get(queryHash)
-
-    const data =
-      state.data === undefined ? state.data : deserializeData(state.data)
-
-    // Do not hydrate if an existing query exists with newer data
-    if (query) {
-      if (query.state.dataUpdatedAt < state.dataUpdatedAt) {
-        // omit fetchStatus from dehydrated state
-        // so that query stays in its current fetchStatus
-        const { fetchStatus: _ignored, ...serializedState } = state
-        query.setState({
-          ...serializedState,
-          data,
+  queries.forEach(
+    ({ queryKey, state, queryHash, meta, promise, dehydratedAt }) => {
+      const syncData = promise ? tryResolveSync(promise) : undefined
+      const rawData = state.data === undefined ? syncData?.data : state.data
+      const data = rawData === undefined ? rawData : deserializeData(rawData)
+
+      let query = queryCache.get(queryHash)
+      const existingQueryIsPending = query?.state.status === 'pending'
+
+      // Do not hydrate if an existing query exists with newer data
+      if (query) {
+        const hasNewerSyncData =
+          syncData &&
+          // We only need this undefined check to handle older dehydration
+          // payloads that might not have dehydratedAt
+          dehydratedAt !== undefined &&
+          dehydratedAt > query.state.dataUpdatedAt
+        if (
+          state.dataUpdatedAt > query.state.dataUpdatedAt ||
+          hasNewerSyncData
+        ) {
+          // omit fetchStatus from dehydrated state
+          // so that query stays in its current fetchStatus
+          const { fetchStatus: _ignored, ...serializedState } = state
+          query.setState({
+            ...serializedState,
+            data,
+          })
+        }
+      } else {
+        // Restore query
+        query = queryCache.build(
+          client,
+          {
+            ...client.getDefaultOptions().hydrate?.queries,
+            ...options?.defaultOptions?.queries,
+            queryKey,
+            queryHash,
+            meta,
+          },
+          // Reset fetch status to idle to avoid
+          // query being stuck in fetching state upon hydration
+          {
+            ...state,
+            data,
+            fetchStatus: 'idle',
+            status: data !== undefined ? 'success' : state.status,
+          },
+        )
+      }
+
+      if (
+        promise &&
+        !existingQueryIsPending &&
+        // Only hydrate if dehydration is newer than any existing data,
+        // this is always true for new queries
+        (dehydratedAt === undefined || dehydratedAt > query.state.dataUpdatedAt)
+      ) {
+        // This doesn't actually fetch - it just creates a retryer
+        // which will re-use the passed `initialPromise`
+        // Note that we need to call these even when data was synchronously
+        // available, as we still need to set up the retryer
+        void query.fetch(undefined, {
+          // RSC transformed promises are not thenable
+          initialPromise: Promise.resolve(promise).then(deserializeData),
         })
       }
-    } else {
-      // Restore query
-      query = queryCache.build(
-        client,
-        {
-          ...client.getDefaultOptions().hydrate?.queries,
-          ...options?.defaultOptions?.queries,
-          queryKey,
-          queryHash,
-          meta,
-        },
-        // Reset fetch status to idle to avoid
-        // query being stuck in fetching state upon hydration
-        {
-          ...state,
-          data,
-          fetchStatus: 'idle',
-        },
-      )
-    }
-
-    if (promise) {
-      // Note: `Promise.resolve` required cause
-      // RSC transformed promises are not thenable
-      const initialPromise = Promise.resolve(promise).then(deserializeData)
-
-      // this doesn't actually fetch - it just creates a retryer
-      // which will re-use the passed `initialPromise`
-      void query.fetch(undefined, { initialPromise })
-    }
-  })
+    },
+  )
 }
diff --git a/packages/query-core/src/thenable.ts b/packages/query-core/src/thenable.ts
index 56717f459d6..c8308b48889 100644
--- a/packages/query-core/src/thenable.ts
+++ b/packages/query-core/src/thenable.ts
@@ -7,6 +7,8 @@
  * @see https://github.com/facebook/react/blob/4f604941569d2e8947ce1460a0b2997e835f37b9/packages/react-debug-tools/src/ReactDebugHooks.js#L224-L227
  */
 
+import { noop } from './utils'
+
 interface Fulfilled<T> {
   status: 'fulfilled'
   value: T
@@ -80,3 +82,30 @@ export function pendingThenable<T>(): PendingThenable<T> {
 
   return thenable
 }
+
+/**
+ * This function takes a Promise-like input and detects whether the data
+ * is synchronously available or not.
+ *
+ * It does not inspect .status, .value or .reason properties of the promise,
+ * as those are not always available, and the .status of React's promises
+ * should not be considered part of the public API.
+ */
+export function tryResolveSync(promise: Promise<unknown> | Thenable<unknown>) {
+  let data: unknown
+
+  promise
+    .then((result) => {
+      data = result
+      return result
+    })
+    // .catch can be unavailable on certain kinds of thenable's
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    ?.catch(noop)
+
+  if (data !== undefined) {
+    return { data }
+  }
+
+  return undefined
+}
diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json
index e71be473372..ec7c4193ddc 100644
--- a/packages/query-persist-client-core/package.json
+++ b/packages/query-persist-client-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-persist-client-core",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "Set of utilities for interacting with persisters, which can save your queryClient for later use",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json
index 36df49f3249..ca5886e2d51 100644
--- a/packages/query-sync-storage-persister/package.json
+++ b/packages/query-sync-storage-persister/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-sync-storage-persister",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "A persister for synchronous storages, to be used with TanStack/Query",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json
index 74822ed0c78..47e20f83fbd 100644
--- a/packages/react-query-devtools/package.json
+++ b/packages/react-query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query-devtools",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "Developer tools to interact with and visualize the TanStack/react-query cache",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/react-query-next-experimental/package.json b/packages/react-query-next-experimental/package.json
index f448d9a1044..a21eaa5bd45 100644
--- a/packages/react-query-next-experimental/package.json
+++ b/packages/react-query-next-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query-next-experimental",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "Hydration utils for React Query in the NextJs app directory",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json
index d379bbcf5e1..1f26c38d993 100644
--- a/packages/react-query-persist-client/package.json
+++ b/packages/react-query-persist-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query-persist-client",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "React bindings to work with persisters in TanStack/react-query",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/react-query/eslint.config.js b/packages/react-query/eslint.config.js
index aadb420b907..7ca2619cfaf 100644
--- a/packages/react-query/eslint.config.js
+++ b/packages/react-query/eslint.config.js
@@ -11,6 +11,9 @@ export default [
   {
     files: ['**/*.{ts,tsx}'],
     ...pluginReact.configs.recommended,
+    rules: {
+      '@eslint-react/no-context-provider': 'off',
+    },
   },
   {
     plugins: {
diff --git a/packages/react-query/package.json b/packages/react-query/package.json
index 1ee7b8a119f..4b4cae0bff2 100644
--- a/packages/react-query/package.json
+++ b/packages/react-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "Hooks for managing, caching and syncing asynchronous and remote data in React",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/react-query/src/HydrationBoundary.tsx b/packages/react-query/src/HydrationBoundary.tsx
index e70c8c6aaba..0854f5d7e35 100644
--- a/packages/react-query/src/HydrationBoundary.tsx
+++ b/packages/react-query/src/HydrationBoundary.tsx
@@ -24,13 +24,6 @@ export interface HydrationBoundaryProps {
   queryClient?: QueryClient
 }
 
-const hasProperty = <TKey extends string>(
-  obj: unknown,
-  key: TKey,
-): obj is { [k in TKey]: unknown } => {
-  return typeof obj === 'object' && obj !== null && key in obj
-}
-
 export const HydrationBoundary = ({
   children,
   options = {},
@@ -45,7 +38,7 @@ export const HydrationBoundary = ({
   const optionsRef = React.useRef(options)
   optionsRef.current = options
 
-  // This useMemo is for performance reasons only, everything inside it _must_
+  // This useMemo is for performance reasons only, everything inside it must
   // be safe to run in every render and code here should be read as "in render".
   //
   // This code needs to happen during the render phase, because after initial
@@ -80,10 +73,11 @@ export const HydrationBoundary = ({
         } else {
           const hydrationIsNewer =
             dehydratedQuery.state.dataUpdatedAt >
-              existingQuery.state.dataUpdatedAt || // RSC special serialized then-able chunks
-            (hasProperty(dehydratedQuery.promise, 'status') &&
-              hasProperty(existingQuery.promise, 'status') &&
-              dehydratedQuery.promise.status !== existingQuery.promise.status)
+              existingQuery.state.dataUpdatedAt ||
+            (dehydratedQuery.promise &&
+              existingQuery.state.status !== 'pending' &&
+              dehydratedQuery.dehydratedAt !== undefined &&
+              dehydratedQuery.dehydratedAt > existingQuery.state.dataUpdatedAt)
 
           const queryAlreadyQueued = hydrationQueue?.find(
             (query) => query.queryHash === dehydratedQuery.queryHash,
@@ -116,6 +110,7 @@ export const HydrationBoundary = ({
   React.useEffect(() => {
     if (hydrationQueue) {
       hydrate(client, { queries: hydrationQueue }, optionsRef.current)
+      // eslint-disable-next-line @eslint-react/hooks-extra/no-direct-set-state-in-use-effect
       setHydrationQueue(undefined)
     }
   }, [client, hydrationQueue])
diff --git a/packages/react-query/src/__tests__/HydrationBoundary.test.tsx b/packages/react-query/src/__tests__/HydrationBoundary.test.tsx
index aea35826c23..2fdf162b8fd 100644
--- a/packages/react-query/src/__tests__/HydrationBoundary.test.tsx
+++ b/packages/react-query/src/__tests__/HydrationBoundary.test.tsx
@@ -8,6 +8,7 @@ import {
   QueryClient,
   QueryClientProvider,
   dehydrate,
+  hydrate,
   useQuery,
 } from '..'
 
@@ -364,4 +365,79 @@ describe('React hydration', () => {
     hydrateSpy.mockRestore()
     queryClient.clear()
   })
+
+  // https://github.com/TanStack/query/issues/8677
+  test('should not infinite loop when hydrating promises that resolve to errors', async () => {
+    const hydrateSpy = vi.spyOn(coreModule, 'hydrate')
+    let hydrationCount = 0
+    hydrateSpy.mockImplementation((...args: Parameters<typeof hydrate>) => {
+      hydrationCount++
+      // Arbitrary number
+      if (hydrationCount > 10) {
+        // This is a rough way to detect it. Calling hydrate multiple times with
+        // the same data is usually fine, but in this case it indicates the
+        // logic in HydrationBoundary is not working as expected.
+        throw new Error('Too many hydrations detected')
+      }
+      return hydrate(...args)
+    })
+
+    const prefetchQueryClient = new QueryClient({
+      defaultOptions: {
+        dehydrate: {
+          shouldDehydrateQuery: () => true,
+        },
+      },
+    })
+    prefetchQueryClient.prefetchQuery({
+      queryKey: ['promise'],
+      queryFn: async () => {
+        await sleep(10)
+        return Promise.reject('Query failed')
+      },
+    })
+
+    const dehydratedState = dehydrate(prefetchQueryClient)
+
+    // Avoid redacted error in test
+    dehydratedState.queries[0]?.promise?.catch(() => {})
+    await vi.advanceTimersByTimeAsync(10)
+    // Mimic what React/our synchronous thenable does for already rejected promises
+    // @ts-expect-error
+    dehydratedState.queries[0].promise.status = 'failure'
+
+    // For the bug to trigger, there needs to already be a query in the cache
+    const queryClient = new QueryClient()
+    await queryClient.prefetchQuery({
+      queryKey: ['promise'],
+      queryFn: () => 'existing',
+    })
+
+    function Page() {
+      const { data } = useQuery({
+        queryKey: ['promise'],
+        queryFn: () => sleep(10).then(() => ['new']),
+      })
+      return (
+        <div>
+          <h1>{data}</h1>
+        </div>
+      )
+    }
+
+    const rendered = render(
+      <QueryClientProvider client={queryClient}>
+        <HydrationBoundary state={dehydratedState}>
+          <Page />
+        </HydrationBoundary>
+      </QueryClientProvider>,
+    )
+    await vi.advanceTimersByTimeAsync(1)
+    expect(rendered.getByText('existing')).toBeInTheDocument()
+    await vi.advanceTimersByTimeAsync(10)
+    expect(rendered.getByText('new')).toBeInTheDocument()
+    hydrateSpy.mockRestore()
+    prefetchQueryClient.clear()
+    queryClient.clear()
+  })
 })
diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json
index 58e739a9568..620164fdca7 100644
--- a/packages/solid-query-devtools/package.json
+++ b/packages/solid-query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query-devtools",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "Developer tools to interact with and visualize the TanStack/solid-query Query cache",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json
index 20d01df701c..b4b33b51f4f 100644
--- a/packages/solid-query-persist-client/package.json
+++ b/packages/solid-query-persist-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query-persist-client",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "Solid.js bindings to work with persisters in TanStack/solid-query",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
index 843546f5930..74bc2f12941 100644
--- a/packages/solid-query/package.json
+++ b/packages/solid-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json
index c848b133583..732903cf2c1 100644
--- a/packages/svelte-query-devtools/package.json
+++ b/packages/svelte-query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/svelte-query-devtools",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "Developer tools to interact with and visualize the TanStack/svelte-query cache",
   "author": "Lachlan Collins",
   "license": "MIT",
diff --git a/packages/svelte-query-persist-client/package.json b/packages/svelte-query-persist-client/package.json
index dda08576316..4d3ba5ebeeb 100644
--- a/packages/svelte-query-persist-client/package.json
+++ b/packages/svelte-query-persist-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/svelte-query-persist-client",
-  "version": "5.76.1",
+  "version": "5.76.2",
   "description": "Svelte bindings to work with persisters in TanStack/svelte-query",
   "author": "Lachlan Collins",
   "license": "MIT",
diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json
index 2b889090fc4..0488f16c848 100644
--- a/packages/svelte-query/package.json
+++ b/packages/svelte-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/svelte-query",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Svelte",
   "author": "Lachlan Collins",
   "license": "MIT",
diff --git a/packages/vue-query-devtools/package.json b/packages/vue-query-devtools/package.json
index 87242ab0e08..f27706f847a 100644
--- a/packages/vue-query-devtools/package.json
+++ b/packages/vue-query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/vue-query-devtools",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "Developer tools to interact with and visualize the TanStack/vue-query cache",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json
index 399b069cd2b..3922a893638 100644
--- a/packages/vue-query/package.json
+++ b/packages/vue-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/vue-query",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "description": "Hooks for managing, caching and syncing asynchronous and remote data in Vue",
   "author": "Damian Osipiuk",
   "license": "MIT",