diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index f959f91178..fe82df243d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -124,6 +124,11 @@ export class AppComponent implements OnInit {
             window.onkeypress = () => this.recordActivity();
         });
 
+        this.platformUtilsService.onDefaultSystemThemeChange(theme => {
+            window.document.documentElement.classList.remove('theme_light', 'theme_dark');
+            window.document.documentElement.classList.add('theme_' + theme);
+        });
+
         this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
             this.ngZone.run(async () => {
                 switch (message.command) {