diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 515f3d503b..1b9a175446 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -598,9 +598,9 @@ define([
 
         const refresh_theme = function (force, caller) {
             if ( force || Common.localStorage.getItem('ui-theme-id') != window.uitheme.id ) {
-                const theme_id = Common.localStorage.getItem('ui-theme-id');
+                let theme_id = Common.localStorage.getItem('ui-theme-id');
 
-                if ( theme_id ) {
+                if ( theme_id && (force && (theme_id = 'theme-system')) ) {
                     apply_theme.call(this, theme_id);
                     Common.NotificationCenter.trigger('uitheme:changed', theme_id, caller);
                 }