diff --git a/dist/base.js b/dist/base.js
index 838cf9ca1..1d51b4dd4 100644
--- a/dist/base.js
+++ b/dist/base.js
@@ -21510,7 +21510,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
-        return this.editor.getValue("\n", function (line) {
+        var v = this.editor.getValue("\n", function (line) {
             var rawText = line.text, value = line.text, num = 0;
             value.text = rawText;
             _.forEach(_.sortBy(line.markedSpans, "from"), function (i, ms) {
@@ -21528,6 +21528,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
             });
             return value;
         });
+        return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
     },
 
     setValue: function (v) {
diff --git a/dist/bundle.js b/dist/bundle.js
index 90b7cbf14..0461f3d01 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -57276,7 +57276,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
-        return this.editor.getValue("\n", function (line) {
+        var v = this.editor.getValue("\n", function (line) {
             var rawText = line.text, value = line.text, num = 0;
             value.text = rawText;
             _.forEach(_.sortBy(line.markedSpans, "from"), function (i, ms) {
@@ -57294,6 +57294,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
             });
             return value;
         });
+        return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
     },
 
     setValue: function (v) {
diff --git a/dist/fineui.js b/dist/fineui.js
index 45f05682e..7f7fb3d19 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -57519,7 +57519,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
-        return this.editor.getValue("\n", function (line) {
+        var v = this.editor.getValue("\n", function (line) {
             var rawText = line.text, value = line.text, num = 0;
             value.text = rawText;
             _.forEach(_.sortBy(line.markedSpans, "from"), function (i, ms) {
@@ -57537,6 +57537,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
             });
             return value;
         });
+        return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
     },
 
     setValue: function (v) {
diff --git a/src/base/sql/editor.sql.js b/src/base/sql/editor.sql.js
index f72eaf8bb..5b02fea26 100644
--- a/src/base/sql/editor.sql.js
+++ b/src/base/sql/editor.sql.js
@@ -112,7 +112,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
-        return this.editor.getValue("\n", function (line) {
+        var v = this.editor.getValue("\n", function (line) {
             var rawText = line.text, value = line.text, num = 0;
             value.text = rawText;
             _.forEach(_.sortBy(line.markedSpans, "from"), function (i, ms) {
@@ -130,6 +130,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
             });
             return value;
         });
+        return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
     },
 
     setValue: function (v) {