1 files changed, 9 insertions, 12 deletions

diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index 561b025f0..85dd0f3df 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -6,25 +6,19 @@ import {
 } from '../environment';
 import {
   LOCAL_SERVER,
+  SERVER_NOT_LOADED,
 } from '../config';
 
-const apiBase = () => {
+const apiBase = (withVersion = true) => {
   let url;
 
   if (!window.ferdi
     || !window.ferdi.stores.settings
     || !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.
-    //    Using a random IP could result in unwanted connections, using localhost could unwantedly
-    //    connect to local develoment servers.
-    //    1.1.1.1 also sends a status 400 response for invalid routes. Other servers may return status 401
-    //    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 === LOCAL_SERVER) {
+    // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
+    return SERVER_NOT_LOADED;
+  } if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
     // Use URL for local server
     url = `http://127.0.0.1:${window.ferdi.stores.requests.localServerPort}`;
   } else {
@@ -32,7 +26,10 @@ const apiBase = () => {
     url = window.ferdi.stores.settings.all.app.server;
   }
 
-  return `${url}/${API_VERSION}`;
+  if (withVersion) {
+    return `${url}/${API_VERSION}`;
+  }
+  return url;
 };
 
 export default apiBase;