diff --git a/packages/builder/src/helpers/data/utils.js b/packages/builder/src/helpers/data/utils.js
index 647c2be33e..cd6a8cf481 100644
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@@ -46,7 +46,7 @@ export function buildQueryString(obj) {
       if (str !== "") {
         str += "&"
       }
-      str += `${key}=${value || ""}`
+      str += `${key}=${encodeURIComponent(value || "")}`
     }
   }
   return str
diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts
index 284d2a921a..59eb1e9941 100644
--- a/packages/server/src/integrations/rest.ts
+++ b/packages/server/src/integrations/rest.ts
@@ -215,7 +215,7 @@ module RestModule {
         }
       }
 
-      const main = `${path}?${queryString}`
+      const main = `${path}?${encodeURIComponent(queryString)}`
       let complete = main
       if (this.config.url && !main.startsWith("http")) {
         complete = !this.config.url ? main : `${this.config.url}/${main}`