diff --git a/packages/services/service-automation/src/engine.ts b/packages/services/service-automation/src/engine.ts
index ac619e54b0..ca1dc211a7 100644
--- a/packages/services/service-automation/src/engine.ts
+++ b/packages/services/service-automation/src/engine.ts
@@ -229,7 +229,7 @@ export class AutomationEngine implements IAutomationService {
         // TODO: Replace with safe expression evaluator (e.g., jexl) for production.
         let resolved = expression;
         for (const [key, value] of variables) {
-            resolved = resolved.replaceAll(`{${key}}`, String(value));
+            resolved = resolved.split(`{${key}}`).join(String(value));
         }
         try {
             return new Function(`return (${resolved})`)() as boolean;
diff --git a/packages/services/service-automation/src/plugins/logic-nodes-plugin.ts b/packages/services/service-automation/src/plugins/logic-nodes-plugin.ts
index 17d4c98c82..e36bfbbb9b 100644
--- a/packages/services/service-automation/src/plugins/logic-nodes-plugin.ts
+++ b/packages/services/service-automation/src/plugins/logic-nodes-plugin.ts
@@ -30,7 +30,7 @@ export class LogicNodesPlugin implements Plugin {
                     // TODO: Replace with safe expression evaluator (e.g., jexl) for production.
                     let expr = cond.expression;
                     for (const [k, v] of variables) {
-                        expr = expr.replaceAll(`{${k}}`, String(v));
+                        expr = expr.split(`{${k}}`).join(String(v));
                     }
                     try {
                         if (new Function(`return (${expr})`)()) {