diff --git a/lib/services/email-service.ts b/lib/services/email-service.ts
index 35d95d80..71249bb3 100644
--- a/lib/services/email-service.ts
+++ b/lib/services/email-service.ts
@@ -156,7 +156,19 @@ export async function getImapConnection(
  */
 export async function getUserEmailCredentials(userId: string): Promise<EmailCredentials | null> {
   const credentials = await prisma.mailCredentials.findFirst({
-    where: { userId }
+    where: { userId },
+    select: {
+      email: true,
+      password: true,
+      host: true,
+      port: true,
+      secure: true,
+      smtp_host: true,
+      smtp_port: true,
+      smtp_secure: true,
+      display_name: true,
+      color: true
+    }
   });
 
   if (!credentials) return null;