diff --git a/lib/compilers/argument-parsers.ts b/lib/compilers/argument-parsers.ts
index 36267bb90d9..96f33b857c5 100644
--- a/lib/compilers/argument-parsers.ts
+++ b/lib/compilers/argument-parsers.ts
@@ -449,7 +449,9 @@ export class ClangirParser extends ClangParser {
             arg: [],
             moduleScopeArg: ['-mmlir', '--mlir-print-ir-before-all', '-mmlir', '--mlir-print-ir-after-all'],
             noDiscardValueNamesArg: [],
-            supportedOptions: ['dump-full-module', 'demangle-symbols'],
+            // Currently 'dump-full-module' is locked to checked by the front-end
+            // supportedOptions: ['dump-full-module', 'demangle-symbols'],
+            supportedOptions: ['demangle-symbols'],
             supportedFilters: [],
         };
     }
diff --git a/static/panes/opt-pipeline.ts b/static/panes/opt-pipeline.ts
index b66ca02e0ff..9376d0bee73 100644
--- a/static/panes/opt-pipeline.ts
+++ b/static/panes/opt-pipeline.ts
@@ -230,13 +230,12 @@ export class OptPipeline extends MonacoPane<monaco.editor.IStandaloneDiffEditor,
     updateButtons() {
         if (!this.compiler || !this.compiler.optPipeline) return;
 
-        const supportedOptions = this.compiler.optPipeline.supportedOptions;
+        const {supportedOptions, supportedFilters} = this.compiler.optPipeline;
         if (supportedOptions) {
             for (const key of ['dump-full-module', '-fno-discard-value-names', 'demangle-symbols']) {
                 this.options.enableToggle(key, supportedOptions.includes(key));
             }
         }
-        const supportedFilters = this.compiler.optPipeline.supportedFilters;
         if (supportedFilters) {
             for (const key of ['filter-debug-info', 'filter-instruction-metadata']) {
                 this.filters.enableToggle(key, supportedFilters.includes(key));
@@ -339,7 +338,6 @@ export class OptPipeline extends MonacoPane<monaco.editor.IStandaloneDiffEditor,
         this.updateTitle();
         this.compiler = compiler;
         this.updateGroupName();
-        this.updateButtons();
         this.updateEditor();
         if (compiler && !compiler.optPipeline) {
             //this.editor.setValue('<Opt pipeline output is not supported for this compiler>');
@@ -347,8 +345,12 @@ export class OptPipeline extends MonacoPane<monaco.editor.IStandaloneDiffEditor,
 
         // TODO: un-hackify this
         if (this.compilerInfo.compilerName.includes('clangir')) {
-            this.options.enableToggle('dump-full-module', false, true);
+            this.options.set('dump-full-module', true);
+            this.filters.set('filter-debug-info', false);
+            this.filters.set('filter-instruction-metadata', false);
         }
+
+        this.updateButtons();
     }
 
     updateGroupName() {
diff --git a/static/widgets/toggles.ts b/static/widgets/toggles.ts
index 6181d22a188..5c11cf72e11 100644
--- a/static/widgets/toggles.ts
+++ b/static/widgets/toggles.ts
@@ -107,15 +107,12 @@ export class Toggles extends EventEmitter {
         this.emit('change', before, this.get());
     }
 
-    enableToggle(key: string, enable: boolean, lockChecked: boolean = false) {
+    enableToggle(key: string, enable: boolean) {
         for (const element of this.buttons) {
             const widget = $(element);
             const button = widget.find('button');
             const bind = button.data('bind');
             if (bind === key) {
-                if (lockChecked) {
-                    this.set(key, true); // Ensure the toggle is checked
-                }
                 button.prop('disabled', !enable);
             }
         }