diff --git a/src/components/Login.vue b/src/components/Login.vue
index 76afa32..f5ce2bf 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -49,6 +49,7 @@
 
 <script>
 import User from "../models/user";
+import util from "../plugins/utils";
 
 export default {
   name: "Login",
@@ -75,7 +76,7 @@ export default {
   },
   created() {
     if (this.loggedIn) {
-      this.$navigation.push({name: "Chat", params: { roomId: this.$matrix.currentRoomId }}, -1);
+      this.$navigation.push({name: "Chat", params: { roomId: util.sanitizeRoomId(this.$matrix.currentRoomId) }}, -1);
     }
   },
   watch: {
@@ -120,7 +121,7 @@ export default {
         this.loading = true;
         this.$store.dispatch("auth/login", user).then(
           () => {
-            this.$navigation.push({name: "Chat", params: { roomId: this.$matrix.currentRoomId }}, -1);
+            this.$navigation.push({name: "Chat", params: { roomId: util.sanitizeRoomId(this.$matrix.currentRoomId) }}, -1);
           },
           (error) => {
             this.loading = false;
diff --git a/src/components/RoomList.vue b/src/components/RoomList.vue
index 55b53cb..8f20a52 100644
--- a/src/components/RoomList.vue
+++ b/src/components/RoomList.vue
@@ -16,6 +16,8 @@
 </template>
 
 <script>
+import util from "../plugins/utils";
+
 export default {
   name: "RoomList",
 
@@ -26,7 +28,7 @@ export default {
   watch: {
     currentRoomId() {
       this.$emit("close");
-      this.$navigation.push({name: 'Chat', params: { roomId: this.currentRoomId }}, -1);
+      this.$navigation.push({name: 'Chat', params: { roomId: util.sanitizeRoomId(this.currentRoomId) }}, -1);
     },
   },
 };