diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
index 9c17aa721..dce2bede0 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
 import { UserService } from '@services/user.service';
 import { AppStateService } from '@state/app-state.service';
-import { LanguageService } from '@i18n/language.service';
 import { PermissionsService } from '@services/permissions.service';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { Router } from '@angular/router';
@@ -26,7 +25,6 @@ export class BaseScreenComponent {
         private readonly _statusOverlayService: StatusOverlayService,
         private readonly _appConfigService: AppConfigService,
         private readonly _router: Router,
-        private readonly _languageService: LanguageService,
         private readonly _userService: UserService,
         private readonly _translateService: TranslateService
     ) {
@@ -56,8 +54,4 @@ export class BaseScreenComponent {
     logout() {
         this._userService.logout();
     }
-
-    changeLanguage(language: string) {
-        this._languageService.changeLanguage(language);
-    }
 }
diff --git a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts
index 170643735..fce3cb90e 100644
--- a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts
+++ b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts
@@ -61,7 +61,7 @@ export class UserProfileScreenComponent implements OnInit {
         this.viewReady = false;
 
         if (this.languageChanged) {
-            this._languageService.changeLanguage(this.formGroup.get('language').value);
+            await this._languageService.changeLanguage(this.formGroup.get('language').value);
         }
 
         if (this.profileChanged) {
diff --git a/apps/red-ui/src/app/i18n/language.service.ts b/apps/red-ui/src/app/i18n/language.service.ts
index 511f51710..398bb84e5 100644
--- a/apps/red-ui/src/app/i18n/language.service.ts
+++ b/apps/red-ui/src/app/i18n/language.service.ts
@@ -30,9 +30,9 @@ export class LanguageService {
         this._translateService.use(defaultLang).subscribe(() => {});
     }
 
-    changeLanguage(language: string) {
+    async changeLanguage(language: string) {
         localStorage.setItem('redaction.language', language);
         document.documentElement.lang = language;
-        this._translateService.use(language).subscribe(() => {});
+        await this._translateService.use(language).toPromise();
     }
 }