diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index 10c97989..1a86545b 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -115,6 +115,9 @@ containerService.attachToWindow(window);
 export function initFactory(): Function {
     return async () => {
         const isDev = platformUtilsService.isDev();
+        if (!isDev && platformUtilsService.isSelfHost()) {
+            environmentService.baseUrl = window.location.origin;
+        }
         await apiService.setUrls({
             base: isDev ? null : window.location.origin,
             api: isDev ? 'http://localhost:4000' : null,