diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts
index 5d0c463e81..fb70bebbd2 100644
--- a/packages/server/src/api/controllers/datasource.ts
+++ b/packages/server/src/api/controllers/datasource.ts
@@ -152,10 +152,6 @@ export async function update(ctx: UserCtx) {
   const auth = datasource.config?.auth
   await invalidateVariables(datasource, ctx.request.body)
 
-  if (!sdk.datasources.isValid(datasource)) {
-    ctx.throw(400, "Environment variables binding format incorrect")
-  }
-
   const isBudibaseSource = datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE
 
   const dataSourceBody = isBudibaseSource
@@ -198,10 +194,6 @@ export async function save(ctx: UserCtx) {
     ...ctx.request.body.datasource,
   }
 
-  if (!sdk.datasources.isValid(datasource)) {
-    ctx.throw(400, "Environment variables binding format incorrect")
-  }
-
   let schemaError = null
   if (fetchSchema) {
     const { tables, error } = await buildSchemaHelper(datasource)
diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts
index df06f12739..4a3880b7b9 100644
--- a/packages/server/src/sdk/app/datasources/datasources.ts
+++ b/packages/server/src/sdk/app/datasources/datasources.ts
@@ -47,14 +47,6 @@ export async function getWithEnvVars(datasourceId: string) {
   return enrichDatasourceWithValues(datasource)
 }
 
-export function isValid(datasource: Datasource) {
-  const blocks = findHBSBlocks(JSON.stringify(datasource))
-  const validList = blocks.filter(
-    block => block.includes(ENV_VAR_PREFIX) || block.includes(USER_PREFIX)
-  )
-  return blocks.length === validList.length
-}
-
 export async function removeSecrets(datasources: Datasource[]) {
   const definitions = await getDefinitions()
   for (let datasource of datasources) {