diff --git a/src/config/Config.ts b/src/config/Config.ts
index d961a45..940c26e 100644
--- a/src/config/Config.ts
+++ b/src/config/Config.ts
@@ -41,21 +41,11 @@ export class Config {
 
   // Convenience accessors
   public static defaultHomeserverUrl(): string | undefined {
-    const defaultServerConfig = Config.get().default_server_config;
-    if (!defaultServerConfig) {
-      return undefined;
-    }
-
-    return defaultServerConfig["m.homeserver"].base_url;
+    return Config.get().default_server_config["m.homeserver"].base_url;
   }
 
   public static defaultServerName(): string | undefined {
-    const defaultServerConfig = Config.get().default_server_config;
-    if (!defaultServerConfig) {
-      return undefined;
-    }
-
-    return defaultServerConfig["m.homeserver"].server_name;
+    return Config.get().default_server_config["m.homeserver"].server_name;
   }
 
   public config?: ConfigOptions;