diff --git a/src/App.tsx b/src/App.tsx
index 0822849d..e9a1129d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -67,9 +67,6 @@ export default function App({ history }: AppProps) {
                     <SentryRoute exact path="/register">
                       <RegisterPage />
                     </SentryRoute>
-                    <SentryRoute path="/room/:roomId?">
-                      <RoomPage />
-                    </SentryRoute>
                     <SentryRoute path="/inspector">
                       <SequenceDiagramViewerPage />
                     </SentryRoute>
diff --git a/src/home/CallList.tsx b/src/home/CallList.tsx
index 545dfade..2cc821b9 100644
--- a/src/home/CallList.tsx
+++ b/src/home/CallList.tsx
@@ -74,7 +74,10 @@ function CallTile({
 }: CallTileProps) {
   return (
     <div className={styles.callTile}>
-      <Link to={`/room/${roomId}`} className={styles.callTileLink}>
+      <Link
+        to={`/${roomId.substring(1).split(":")[0]}`}
+        className={styles.callTileLink}
+      >
         <Avatar
           size={Size.LG}
           bgKey={name}
diff --git a/src/home/RegisteredView.tsx b/src/home/RegisteredView.tsx
index ee696d20..cd5bc02a 100644
--- a/src/home/RegisteredView.tsx
+++ b/src/home/RegisteredView.tsx
@@ -72,7 +72,7 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
         const [roomIdOrAlias] = await createRoom(client, roomName, ptt);
 
         if (roomIdOrAlias) {
-          history.push(`/room/${roomIdOrAlias}`);
+          history.push(`/${roomIdOrAlias.substring(1).split(":")[0]}`);
         }
       }
 
diff --git a/src/home/UnauthenticatedView.tsx b/src/home/UnauthenticatedView.tsx
index 1fb1a84b..f49cf218 100644
--- a/src/home/UnauthenticatedView.tsx
+++ b/src/home/UnauthenticatedView.tsx
@@ -86,8 +86,7 @@ export const UnauthenticatedView: FC = () => {
             setOnFinished(() => {
               setClient(client, session);
               const aliasLocalpart = roomAliasLocalpartFromRoomName(roomName);
-              const [, serverName] = client.getUserId().split(":");
-              history.push(`/room/#${aliasLocalpart}:${serverName}`);
+              history.push(`/${aliasLocalpart}`);
             });
 
             setLoading(false);
@@ -100,7 +99,7 @@ export const UnauthenticatedView: FC = () => {
 
         // Only consider the registration successful if we managed to create the room, too
         setClient(client, session);
-        history.push(`/room/${roomIdOrAlias}`);
+        history.push(`/${roomIdOrAlias.substring(1).split(":")[0]}`);
       }
 
       submit().catch((error) => {
diff --git a/src/matrix-utils.ts b/src/matrix-utils.ts
index 9a7645d2..85a7b313 100644
--- a/src/matrix-utils.ts
+++ b/src/matrix-utils.ts
@@ -346,15 +346,11 @@ export async function createRoom(
 // Returns a URL to that will load Element Call with the given room
 export function getRoomUrl(roomIdOrAlias: string): string {
   if (roomIdOrAlias.startsWith("#")) {
-    const [localPart, host] = roomIdOrAlias.replace("#", "").split(":");
-
-    if (host !== Config.defaultServerName()) {
-      return `${window.location.protocol}//${window.location.host}/room/${roomIdOrAlias}`;
-    } else {
-      return `${window.location.protocol}//${window.location.host}/${localPart}`;
-    }
+    return `${window.location.protocol}//${window.location.host}/${
+      roomIdOrAlias.substring(1).split(":")[0]
+    }`;
   } else {
-    return `${window.location.protocol}//${window.location.host}/room/#?roomId=${roomIdOrAlias}`;
+    return `${window.location.protocol}//${window.location.host}?roomId=${roomIdOrAlias}`;
   }
 }