diff --git a/apps/studio/data/vault/vault-secret-create-mutation.ts b/apps/studio/data/vault/vault-secret-create-mutation.ts
index fbdac08727..bb28f59cd5 100644
--- a/apps/studio/data/vault/vault-secret-create-mutation.ts
+++ b/apps/studio/data/vault/vault-secret-create-mutation.ts
@@ -1,8 +1,8 @@
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import { Query } from 'components/grid/query/Query'
 import { executeSql } from 'data/sql/execute-sql-query'
+import { quoteLiteral } from 'lib/pg-format'
 import type { ResponseError, VaultSecret } from 'types'
 import { vaultSecretsKeys } from './keys'
 
@@ -17,10 +17,14 @@ export async function createVaultSecret({
   ...newSecret
 }: VaultSecretCreateVariables) {
   const { name, description, secret, key_id } = newSecret
-  const sql = new Query()
-    .from('secrets', 'vault')
-    .insert([{ name, description, secret, key_id }], { returning: true })
-    .toSql()
+  const sql = /* SQL */ `
+select vault.create_secret(
+    new_secret := ${quoteLiteral(secret)}
+  ${name ? `, new_name := ${quoteLiteral(name)}` : ''}
+  ${description ? `, new_description := ${quoteLiteral(description)}` : ''}
+  ${key_id ? `, new_key_id := ${quoteLiteral(key_id)}` : ''}
+)
+`
 
   const { result } = await executeSql({ projectRef, connectionString, sql })
   return result
diff --git a/apps/studio/data/vault/vault-secret-update-mutation.ts b/apps/studio/data/vault/vault-secret-update-mutation.ts
index fe74fb27ef..a1467eb50d 100644
--- a/apps/studio/data/vault/vault-secret-update-mutation.ts
+++ b/apps/studio/data/vault/vault-secret-update-mutation.ts
@@ -1,8 +1,8 @@
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import { Query } from 'components/grid/query/Query'
 import { executeSql } from 'data/sql/execute-sql-query'
+import { quoteLiteral } from 'lib/pg-format'
 import type { ResponseError, VaultSecret } from 'types'
 import { vaultSecretsKeys } from './keys'
 
@@ -18,11 +18,16 @@ export async function updateVaultSecret({
   id,
   ...payload
 }: VaultSecretUpdateVariables) {
-  const sql = new Query()
-    .from('decrypted_secrets', 'vault')
-    .update({ ...payload, updated_at: new Date().toISOString() }, { returning: true })
-    .match({ id })
-    .toSql()
+  const { name, description, secret, key_id } = payload
+  const sql = /* SQL */ `
+select vault.update_secret(
+    secret_id := ${quoteLiteral(id)}
+  ${secret ? `, new_secret := ${quoteLiteral(secret)}` : ''}
+  ${name ? `, new_name := ${quoteLiteral(name)}` : ''}
+  ${description ? `, new_description := ${quoteLiteral(description)}` : ''}
+  ${key_id ? `, new_key_id := ${quoteLiteral(key_id)}` : ''}
+)
+`
 
   const { result } = await executeSql({ projectRef, connectionString, sql })
   return result