diff --git a/src/app/app.component.html b/src/app/app.component.html
index 9000684f..25373329 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -11,8 +11,8 @@
       {{ 'app.user-manual' | translate }}
     </a>
     <sbb-select
-      (selectionChange)="changeLanguage($event.value)"
-      [value]="language"
+      (selectionChange)="language = $event.value"
+      [value]="localStorageLanguage"
       class="language-selector"
     >
       <sbb-option value="en">🇬🇧 English</sbb-option>
@@ -35,8 +35,8 @@
   </sbb-usermenu>
   <sbb-menu #menu="sbbMenu">
     <sbb-select
-      (selectionChange)="changeLanguage($event.value)"
-      [value]="language"
+      (selectionChange)="language = $event.value"
+      [value]="localStorageLanguage"
       class="language-selector language-selector-menu"
       (click)="$event.stopPropagation()"
       (keydown)="$event.stopPropagation()"
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index be9448ea..5f4eb55d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -11,6 +11,7 @@ import {NetzgrafikDto} from "./data-structures/business.data.structures";
 import {Operation} from "./models/operation.model";
 import {LabelService} from "./services/data/label.serivce";
 import {NodeService} from "./services/data/node.service";
+import {I18nService} from "./core/i18n/i18n.service";
 
 @Component({
   selector: "sbb-root",
@@ -22,6 +23,7 @@ export class AppComponent {
   readonly version = packageJson.version;
   readonly environmentLabel = environment.label;
   readonly authenticated: Promise<unknown>;
+  protected localStorageLanguage: string;
 
   projectInMenu: Observable<ProjectDto | null>;
 
@@ -45,8 +47,10 @@ export class AppComponent {
               private trainrunSectionService: TrainrunSectionService,
               private nodeService: NodeService,
               private labelService: LabelService,
+              private i18nService: I18nService,
             ) {
-    this.language = localStorage.getItem("i18nLng");
+    this.i18nService.setLanguage();
+    this.localStorageLanguage = localStorage.getItem("i18nLng");
     if (!this.disableBackend) {
       this.authenticated = authService.initialized;
     }
@@ -58,14 +62,15 @@ export class AppComponent {
     }
   }
 
-  changeLanguage(language: string) {
-    localStorage.setItem("i18nLng", language);
-    this.language = language;
-    location.reload();
+  @Input()
+  set language(value: string) {
+    if (value !== this.localStorageLanguage) {
+      localStorage.setItem("i18nLng", value);
+      this.i18nService.setLanguage();
+      this.localStorageLanguage = localStorage.getItem("i18nLng");
+    }
   }
 
-  @Input() language: string;
-
   @Input()
   get netzgrafikDto() {
     return this.dataService.getNetzgrafikDto();