diff --git a/apps/studio/data/api-keys/api-key-create-mutation.ts b/apps/studio/data/api-keys/api-key-create-mutation.ts
index 0cc6b36ec57..f84d56055ec 100644
--- a/apps/studio/data/api-keys/api-key-create-mutation.ts
+++ b/apps/studio/data/api-keys/api-key-create-mutation.ts
@@ -36,7 +36,7 @@ export async function createAPIKey(payload: APIKeyCreateVariables) {
         ? {
             // secret_jwt_template: payload?.secret_jwt_template || null,
             secret_jwt_template: {
-              role: 'service_role', // @mildtomato (Jonny) this should be default in API for type secret
+              role: 'service_role',
             },
           }
         : name),
diff --git a/apps/studio/data/api-keys/keys.ts b/apps/studio/data/api-keys/keys.ts
index 222a51b0b1c..e0bfd893264 100644
--- a/apps/studio/data/api-keys/keys.ts
+++ b/apps/studio/data/api-keys/keys.ts
@@ -1,6 +1,6 @@
 export const apiKeysKeys = {
   list: (projectRef?: string, reveal?: boolean) =>
-    ['projects', projectRef, 'api-keys', reveal] as const,
+    ['projects', projectRef, 'api-keys', reveal].filter(Boolean),
   single: (projectRef?: string, id?: string) => ['projects', projectRef, 'api-keys', id] as const,
   status: (projectRef?: string) => ['projects', projectRef, 'api-keys', 'legacy'] as const,
 }