diff --git a/packages/react-server/core/ClientController.js b/packages/react-server/core/ClientController.js
index 3f5204465..138c24be7 100644
--- a/packages/react-server/core/ClientController.js
+++ b/packages/react-server/core/ClientController.js
@@ -279,6 +279,11 @@ class ClientController extends EventEmitter {
 					reuseDom: true,
 				});
 			}
+		} else if (this._history) {
+
+			// We're in a frameback frame, but we want to make sure that the
+			// frame's `document.location` stays up to date.
+			window.history.replaceState(null, null, url);
 		}
 
 		// If we've got control of the URL bar we'll also take responsibility