diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 56cb728f9..ea1207f29 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -262,7 +262,8 @@ define([
 
             currentThemeId: function () {
                 var t = Common.localStorage.getItem('ui-theme') || Common.localStorage.getItem('ui-theme-id');
-                return get_ui_theme_name(t) || id_default_light_theme;
+                var id = get_ui_theme_name(t);
+                return !!themes_map[id] ? id : id_default_light_theme;
             },
 
             defaultThemeId: function (type) {