diff --git a/js/client.js b/js/client.js
index d0611fe9e..e3b729646 100644
--- a/js/client.js
+++ b/js/client.js
@@ -802,6 +802,9 @@
 				// Just open the main menu.
 				fragment = '';
 			}
+			if (location.search && window.history) {
+				history.replaceState(null, null, '/');
+			}
 			fragment = toRoomid(fragment || '');
 			if (this.initialFragment === undefined) this.initialFragment = fragment;
 			this.tryJoinRoom(fragment);