diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts
index d212f7f361..3d41cd89af 100644
--- a/packages/server/src/api/controllers/datasource.ts
+++ b/packages/server/src/api/controllers/datasource.ts
@@ -84,8 +84,9 @@ export async function buildSchemaFromDb(ctx: UserCtx) {
   setDefaultDisplayColumns(datasource)
   const dbResp = await db.put(datasource)
   datasource._rev = dbResp.rev
+  const cleanedDatasource = await sdk.datasources.removeSecretSingle(datasource)
 
-  const response: any = { datasource }
+  const response: any = { datasource: cleanedDatasource }
   if (error) {
     response.error = error
   }