diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 2972b089d5..0364e257ee 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -118,6 +118,9 @@ export class AppComponent implements OnInit {
                         this.systemService.cancelProcessReload();
                         break;
                     case 'loggedOut':
+                        if (this.modal != null) {
+                            this.modal.close();
+                        }
                         this.notificationsService.updateConnection();
                         this.updateAppMenu();
                         this.systemService.startProcessReload();
@@ -133,6 +136,9 @@ export class AppComponent implements OnInit {
                         await this.lockService.lock(true);
                         break;
                     case 'locked':
+                        if (this.modal != null) {
+                            this.modal.close();
+                        }
                         this.router.navigate(['lock']);
                         this.notificationsService.updateConnection();
                         this.updateAppMenu();