2 files changed, 2 insertions, 7 deletions

diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts
index bc2cb3dd1..649895fbc 100644
--- a/src/api/apiBase.ts
+++ b/src/api/apiBase.ts
@@ -14,12 +14,7 @@ import { fixUrl } from '../helpers/url-helpers';
 
 // Note: This cannot be used from the internal-server since we are not running within the context of a browser window
 export default function apiBase(withVersion = true) {
-  if (
-    !(window as any).ferdium ||
-    !(window as any).ferdium.stores.settings ||
-    !(window as any).ferdium.stores.settings.all ||
-    !(window as any).ferdium.stores.settings.all.app.server
-  ) {
+  if (!(window as any).ferdium?.stores.settings?.all?.app.server) {
     // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
     return SERVER_NOT_LOADED;
   }
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts
index a3d873c65..860b7b76e 100644
--- a/src/api/server/ServerApi.ts
+++ b/src/api/server/ServerApi.ts
@@ -507,7 +507,7 @@ export default class ServerApi {
   async _mapServiceModels(services: any[]) {
     const recipes = services.map((s: { recipeId: string }) => s.recipeId);
     await this._bulkRecipeCheck(recipes);
-    /* eslint-disable no-return-await */
+
     return Promise.all(
       services.map(async (service: any) => this._prepareServiceModel(service)),
     );