diff --git a/src/Ombi/.vscode/settings.json b/src/Ombi/.vscode/settings.json
index 01fa26564..497cd5996 100644
--- a/src/Ombi/.vscode/settings.json
+++ b/src/Ombi/.vscode/settings.json
@@ -14,6 +14,7 @@
     "conventionalCommits.scopes": [
         "discover",
         "request-limits",
-        "notifications"
+        "notifications",
+        "settings"
     ]
 }
diff --git a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.ts b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.ts
index b1e4de171..8d42419fe 100644
--- a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.ts
@@ -63,6 +63,7 @@ export class PlexComponent implements OnInit, OnDestroy {
         server.plexAuthToken = selectedServer.accessToken;
         server.port = parseInt(selectedServer.port);
         server.ssl = selectedServer.scheme === "http" ? false : true;
+        server.serverHostname = "";
 
         this.notificationService.success(`Selected ${server.name}!`);
     }
@@ -128,7 +129,7 @@ export class PlexComponent implements OnInit, OnDestroy {
         let invalid = false;
 
         this.settings.servers.forEach(server => {
-            if (server.serverHostname.length > 0 && !server.serverHostname.startsWith("http")) {
+            if (server.serverHostname && server.serverHostname.length > 0 && !server.serverHostname.startsWith("http")) {
                 invalid = true;
             }
         });