diff --git a/src/js/profile/application_settings.js b/src/js/profile/application_settings.js
index 1230a1a7..7938412c 100644
--- a/src/js/profile/application_settings.js
+++ b/src/js/profile/application_settings.js
@@ -16,7 +16,7 @@ const logger = createLogger("application_settings");
 
 const categoryGame = "game";
 const categoryApp = "app";
-const categoryDebug = "debug";
+export const categoryDebug = "debug";
 
 export const uiScales = [
     {
@@ -205,7 +205,7 @@ export const allApplicationSettings = [
 /** @type {Array<BaseSetting>} */
 export const allDebugSettings = [];
 for (const k in globalConfig.debug) {
-    allDebugSettings.push(new BoolSetting("debug_" + k, categoryDebug, (app, value) => globalConfig.debug[k] = value));
+    allDebugSettings.push(new BoolSetting("debug_" + k, categoryDebug, (app, value) => {if (globalConfig.debug.enableDebugSettings) globalConfig.debug[k] = value;}));
 }
 allApplicationSettings.push(...allDebugSettings);
 
diff --git a/src/js/states/settings.js b/src/js/states/settings.js
index e7270c1b..eb1f2e85 100644
--- a/src/js/states/settings.js
+++ b/src/js/states/settings.js
@@ -1,7 +1,7 @@
-import { globalConfig } from "../core/config";
+import { globalConfig, IS_DEBUG } from "../core/config";
 import { TextualGameState } from "../core/textual_game_state";
 import { formatSecondsToTimeAgo } from "../core/utils";
-import { allApplicationSettings, allDebugSettings } from "../profile/application_settings";
+import { allApplicationSettings, allDebugSettings, categoryDebug } from "../profile/application_settings";
 import { T } from "../translations";
 
 export class SettingsState extends TextualGameState {
@@ -41,17 +41,18 @@ export class SettingsState extends TextualGameState {
     getSettingsHtml() {
         let lastCategory = null;
         let html = "";
+        const hideDebug = IS_DEBUG ? "" : " style='display:none'";
         for (let i = 0; i < allApplicationSettings.length; ++i) {
             const setting = allApplicationSettings[i];
-            const hidden =  allDebugSettings.indexOf(setting) != -1 && !globalConfig.debug.showDebugSettings;
+            const hidden =  allDebugSettings.indexOf(setting) != -1 && !globalConfig.debug.enableDebugSettings;
 
             if (setting.categoryId !== lastCategory) {
                 lastCategory = setting.categoryId;
                 if (i !== 0) {
                     html += "</div>";
                 }
-                html += `<strong class="categoryLabel"${hidden ? " hidden" : ""}>${T.settings.categories[lastCategory]}</strong>`;
-                html += `<div class='settingsContainer'${hidden ? " hidden" : ""}>`;
+                html += `<strong class="categoryLabel"${lastCategory == categoryDebug ? hideDebug : ""}>${T.settings.categories[lastCategory]}</strong>`;
+                html += `<div class="settingsContainer"${lastCategory == categoryDebug ? hideDebug : ""}>`;
             }
 
             html += setting.getHtml();