diff --git a/packages/server/src/db/schema/libsql.ts b/packages/server/src/db/schema/libsql.ts
index 94f81e6a8..770ed2355 100644
--- a/packages/server/src/db/schema/libsql.ts
+++ b/packages/server/src/db/schema/libsql.ts
@@ -179,11 +179,9 @@ export const apiCreateLibsql = createSchema
 		}
 	});
 
-export const apiFindOneLibsql = createSchema
-	.pick({
-		libsqlId: true,
-	})
-	.required();
+export const apiFindOneLibsql = z.object({
+	libsqlId: z.string().min(1),
+});
 
 export const apiChangeLibsqlStatus = createSchema
 	.pick({
diff --git a/packages/server/src/db/schema/mount.ts b/packages/server/src/db/schema/mount.ts
index 233749b59..6acc859d2 100644
--- a/packages/server/src/db/schema/mount.ts
+++ b/packages/server/src/db/schema/mount.ts
@@ -149,14 +149,10 @@ export const apiRemoveMount = createSchema
 	// })
 	.required();
 
-export const apiFindMountByApplicationId = createSchema
-	.pick({
-		serviceType: true,
-	})
-	.required()
-	.extend({
-		serviceId: z.string().min(1),
-	});
+export const apiFindMountByApplicationId = z.object({
+	serviceType: z.string().min(1).transform((val) => val as ServiceType),
+	serviceId: z.string().min(1),
+});
 
 export const apiUpdateMount = createSchema.partial().extend({
 	mountId: z.string().min(1),