diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js
index 7a2f2f2b2..94d40e7ed 100644
--- a/apps/documenteditor/forms/app/controller/ApplicationController.js
+++ b/apps/documenteditor/forms/app/controller/ApplicationController.js
@@ -1943,9 +1943,13 @@ define([
 
             Common.NotificationCenter.on({
                 'uitheme:changed' : function (name) {
-                    var theme = Common.UI.Themes.get(name);
-                    if ( theme )
-                        native.execCommand("uitheme:changed", JSON.stringify({name:name, type:theme.type}));
+                    if (Common.localStorage.getBool('ui-theme-use-system', false)) {
+                        native.execCommand("uitheme:changed", JSON.stringify({name:'theme-system'}));
+                    } else {
+                        const theme = Common.UI.Themes.get(name);
+                        if ( theme )
+                            native.execCommand("uitheme:changed", JSON.stringify({name:name, type:theme.type}));
+                    }
                 },
             });