diff --git a/packages/altair-app/src/app/modules/altair/components/query-editor/query-editor.component.html b/packages/altair-app/src/app/modules/altair/components/query-editor/query-editor.component.html
index 0b1f22cf97..d8ff2125b4 100644
--- a/packages/altair-app/src/app/modules/altair/components/query-editor/query-editor.component.html
+++ b/packages/altair-app/src/app/modules/altair/components/query-editor/query-editor.component.html
@@ -67,6 +67,7 @@
             [tabSize]="tabSize"
             [showVariableDialog]="showVariableDialog"
             [enableExperimental]="enableExperimental"
+            [betaDisableNewEditor]="betaDisableNewEditor"
             (variablesChange)="variablesChange.emit($event)"
           ></app-variables-editor>
         </div>
diff --git a/packages/altair-app/src/app/modules/altair/components/variables-editor/variables-editor.component.html b/packages/altair-app/src/app/modules/altair/components/variables-editor/variables-editor.component.html
index 1e9fdf43b9..1b269c9870 100644
--- a/packages/altair-app/src/app/modules/altair/components/variables-editor/variables-editor.component.html
+++ b/packages/altair-app/src/app/modules/altair/components/variables-editor/variables-editor.component.html
@@ -1,5 +1,5 @@
 <app-codemirror
-  *ngIf="enableExperimental"
+  *ngIf="!betaDisableNewEditor"
   #newEditor
   class="set-variable-textarea mousetrap"
   [extensions]="editorExtensions"
@@ -7,7 +7,7 @@
   (ngModelChange)="variablesChange.emit($event)"
 ></app-codemirror>
 <ngx-codemirror
-  *ngIf="!enableExperimental"
+  *ngIf="betaDisableNewEditor"
   #editor
   class="set-variable-textarea mousetrap"
   [options]="variableEditorConfig"
diff --git a/packages/altair-app/src/app/modules/altair/components/variables-editor/variables-editor.component.ts b/packages/altair-app/src/app/modules/altair/components/variables-editor/variables-editor.component.ts
index f7d7772af7..f69ef94266 100644
--- a/packages/altair-app/src/app/modules/altair/components/variables-editor/variables-editor.component.ts
+++ b/packages/altair-app/src/app/modules/altair/components/variables-editor/variables-editor.component.ts
@@ -45,6 +45,7 @@ export class VariablesEditorComponent implements AfterViewInit, OnChanges {
   @Input() tabSize = 4;
   @Input() showVariableDialog = false;
   @Input() enableExperimental = false;
+  @Input() betaDisableNewEditor = true;
 
   @Output() variablesChange = new EventEmitter();
 
@@ -115,6 +116,19 @@ export class VariablesEditorComponent implements AfterViewInit, OnChanges {
     ) {
       handleEditorRefresh(this.editor?.codeMirror);
     }
+
+    if (changes?.betaDisableNewEditor) {
+      // Using timeout to wait for editor to be initialized.
+      // This is hacky but should be fine since the beta should be temporary
+      setTimeout(() => {
+        if (this.newEditor?.view) {
+          updateSchema(
+            this.newEditor.view,
+            vttToJsonSchema(this.variableToType)
+          );
+        }
+      }, 10);
+    }
   }
 
   onKeyUp(cm: CodeMirror.Editor, event: KeyboardEvent) {