diff --git a/src/components/Join.vue b/src/components/Join.vue
index e0dda2a..268d0c6 100644
--- a/src/components/Join.vue
+++ b/src/components/Join.vue
@@ -216,7 +216,9 @@ export default {
   },
   filters: {
     removeHomeServer(roomName) {
-      return roomName ? roomName.substring(roomName.indexOf("#") + 1, roomName.lastIndexOf(":")) : '';
+      let lastIndexDash = roomName.lastIndexOf("-");
+      let lastIndex = lastIndexDash > 0 ? lastIndexDash : roomName.lastIndexOf(":");
+      return roomName ? roomName.substring(roomName.indexOf("#") + 1, lastIndex) : '';
     }
   },
   watch: {