diff --git a/src/services/matrix.service.js b/src/services/matrix.service.js
index 3283c48..ff72395 100644
--- a/src/services/matrix.service.js
+++ b/src/services/matrix.service.js
@@ -67,14 +67,7 @@ export default {
         },
 
         currentUserHomeServer() {
-          if (this.$config.defaultServer) {
-            var homeServer = this.$config.defaultServer;
-            if (homeServer.startsWith("https://")) {
-              homeServer = homeServer.substring(8);
-            }
-            return homeServer;
-          }
-          return User.serverName(this.currentUserId);
+            return this.$config.homeServer ? this.$config.homeServer : User.serverName(this.currentUserId);
         },
 
         currentRoomId() {