diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index a990906ade..715d08df44 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -871,6 +871,9 @@ class JMXGenerator {
       this.addEnvironments(environment.headers, scenario.headers)
     }
     let headers = this.filterKV(scenario.headers);
+    headers.forEach(h => {
+      h.value = calculate(h.value);
+    });
     if (headers.length > 0) {
       let name = scenario.name + " Headers"
       threadGroup.put(new HeaderManager(name, headers));
@@ -881,6 +884,9 @@ class JMXGenerator {
     let name = request.name + " Headers";
     this.addBodyFormat(request);
     let headers = this.filterKV(request.headers);
+    headers.forEach(h => {
+      h.value = calculate(h.value);
+    });
     if (headers.length > 0) {
       httpSamplerProxy.put(new HeaderManager(name, headers));
     }
@@ -931,6 +937,9 @@ class JMXGenerator {
     let body = [];
     if (request.body.isKV()) {
       body = this.filterKV(request.body.kvs);
+      body.forEach(arg => {
+        arg.value = calculate(arg.value);
+      });
     } else {
       httpSamplerProxy.boolProp('HTTPSampler.postBodyRaw', true);
       body.push({name: '', value: request.body.raw, encode: false});