diff --git a/src-tauri/src/render.rs b/src-tauri/src/render.rs
index 07e6631a..ef389820 100644
--- a/src-tauri/src/render.rs
+++ b/src-tauri/src/render.rs
@@ -13,12 +13,18 @@ fn render_with_environment(template: &str, environment: &Environment) -> String
     let mut map = HashMap::new();
     let variables = &environment.variables.0;
     for variable in variables {
-        map.insert(variable.name.as_str(), variable.value.as_str());
+        if !variable.enabled {
+            continue;
+        }
+        map.insert(
+            variable.name.as_str(), 
+            variable.value.as_str(),
+        );
     }
 
     Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}")
         .expect("Failed to create regex")
-        .replace(template, |caps: &tauri::regex::Captures| {
+        .replace_all(template, |caps: &tauri::regex::Captures| {
             let key = caps.get(1).unwrap().as_str();
             map.get(key).unwrap_or(&"")
         })
diff --git a/src-web/components/core/Editor/twig/extension.ts b/src-web/components/core/Editor/twig/extension.ts
index f335b264..a5b2fb13 100644
--- a/src-web/components/core/Editor/twig/extension.ts
+++ b/src-web/components/core/Editor/twig/extension.ts
@@ -14,7 +14,7 @@ export function twig(
   environment: Environment | null,
   autocomplete?: GenericCompletionConfig,
 ) {
-  const variables = environment?.variables ?? [];
+  const variables = environment?.variables.filter(v => v.enabled) ?? [];
   const completions = twigCompletion({ options: variables });
 
   const language = mixLanguage(base);