diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js
index 6731aea51c..0a5b9f0461 100644
--- a/packages/builder/src/builderStore/store/backend.js
+++ b/packages/builder/src/builderStore/store/backend.js
@@ -135,6 +135,9 @@ export const getBackendUiStore = () => {
         }
         query.datasourceId = datasourceId
         const response = await api.post(`/api/queries`, query)
+        if (response.status !== 200) {
+          throw new Error("Failed saving query.")
+        }
         const json = await response.json()
         store.update(state => {
           const currentIdx = state.queries.findIndex(
diff --git a/packages/server/src/api/routes/query.js b/packages/server/src/api/routes/query.js
index 4266cf6bdc..55223e4e9e 100644
--- a/packages/server/src/api/routes/query.js
+++ b/packages/server/src/api/routes/query.js
@@ -27,7 +27,7 @@ function generateQueryValidation() {
     readable: Joi.boolean(),
     parameters: Joi.array().items(Joi.object({
       name: Joi.string(),
-      default: Joi.string()
+      default: Joi.string().allow(""),
     })),
     queryVerb: Joi.string().allow().required(),
     schema: Joi.object({}).required().unknown(true)