diff --git a/src/vector/app.tsx b/src/vector/app.tsx
index c405ed8a0d..d609a2558d 100644
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -74,7 +74,10 @@ function onNewScreen(screen: string, replaceLast = false) {
     lastLocationHashSet = hash;
 
     // if the new hash is a substring of the old one then we are stripping fields e.g `via` so replace history
-    if (screen.startsWith("room/") && window.location.hash.startsWith(hash)) {
+    if (screen.startsWith("room/") &&
+        window.location.hash.includes("/$") === hash.includes("/$") && // only if both did or didn't contain event link
+        window.location.hash.startsWith(hash)
+    ) {
         replaceLast = true;
     }