diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index 708e3c137b7..eb11b91d14f 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -145,7 +145,7 @@ export function initFactory(): Function {
     return async () => {
         await (storageService as HtmlStorageService).init();
 
-        if (process.env.ENV !== 'production') {
+        if (process.env.ENV !== 'production' || platformUtilsService.isSelfHost()) {
             environmentService.baseUrl = window.location.origin;
         } else {
             environmentService.notificationsUrl = 'https://notifications.bitwarden.com';