diff --git a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
index 427fbd1f2b..72e255ff00 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
@@ -2,6 +2,7 @@
 import Handlebars from "handlebars"
 import type { Diagnostic } from "@codemirror/lint"
 import { CodeValidator } from "@/types"
+import { featureFlag } from "@/helpers"
 
 function isMustacheStatement(
   node: hbs.AST.Statement
@@ -94,13 +95,14 @@ export function validateHbsTemplate(
         }
 
         if (isBlockStatement(node)) {
-          // TODO: feature flag
           traverseNodes(node.program.body, { ignoreMissing: true })
         }
       })
     }
 
-    traverseNodes(ast.body)
+    traverseNodes(ast.body, {
+      ignoreMissing: !featureFlag.isEnabled("VALIDATE_HBS_MISSING_EXPRESSIONS"),
+    })
   } catch (e: any) {
     diagnostics.push({
       from: 0,
diff --git a/packages/types/src/sdk/featureFlag.ts b/packages/types/src/sdk/featureFlag.ts
index 996d3bba8d..f39e5105eb 100644
--- a/packages/types/src/sdk/featureFlag.ts
+++ b/packages/types/src/sdk/featureFlag.ts
@@ -1,5 +1,6 @@
 export enum FeatureFlag {
   USE_ZOD_VALIDATOR = "USE_ZOD_VALIDATOR",
+  VALIDATE_HBS_MISSING_EXPRESSIONS = "VALIDATE_HBS_MISSING_EXPRESSIONS",
 
   // Account-portal
   DIRECT_LOGIN_TO_ACCOUNT_PORTAL = "DIRECT_LOGIN_TO_ACCOUNT_PORTAL",