Improve apibase function

1 files changed, 4 insertions, 5 deletions

diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index ce02922ac..b40673e44 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -8,9 +8,11 @@ import {
 
 const apiBase = () => {
   let url;
+
   if (!window.ferdi
     || !window.ferdi.stores.settings
-    || !window.ferdi.stores.settings.all) {
+    || !window.ferdi.stores.settings.all
+    || !window.ferdi.stores.settings.all.app.server) {
     // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded
     //  "Why 1.1.1.1 as the default, invalid URL?"
     //    1.1.1.1 is the server for Cloudflare's DNS service and will be the same across most networks.
@@ -20,12 +22,9 @@ const apiBase = () => {
     //    on some routes. This would result in Ferdi deleting its current authToken as it thinks it
     //    has gone invalid.
     url = 'https://1.1.1.1';
-  } else if (window.ferdi.stores.settings.all.app.server) {
+  } else {
     // Load URL from store
     url = window.ferdi.stores.settings.all.app.server;
-  } else {
-    // Use default server url
-    url = API;
   }
 
   return `${url}/${API_VERSION}`;