diff --git a/app/api/contact/route.ts b/app/api/contact/route.ts
index c4455ab..09bbf10 100644
--- a/app/api/contact/route.ts
+++ b/app/api/contact/route.ts
@@ -123,7 +123,7 @@ export async function POST(req: Request) {
           subject: `Kontaktanfrage von ${name}`,
           html: notificationHtml,
         });
-        logger.info("Notification email sent successfully", { messageId: info.messageId });
+        logger.info("Notification email sent successfully", { messageId: info?.messageId });
       } catch (notifyError) {
         logger.error("Failed to send notification email", { error: notifyError });
         throw notifyError; // Re-throw to be caught by the outer SMTP catch
@@ -145,7 +145,7 @@ export async function POST(req: Request) {
           subject: `Ihre Kontaktanfrage bei ${clientName}`,
           html: confirmationHtml,
         });
-        logger.info("Confirmation email sent successfully", { messageId: info.messageId });
+        logger.info("Confirmation email sent successfully", { messageId: info?.messageId });
       } catch (confirmError) {
         logger.warn(
           "Failed to send confirmation email, but notification was sent",
diff --git a/tests/api-contact.test.ts b/tests/api-contact.test.ts
index 6cd1a94..16d3d5a 100644
--- a/tests/api-contact.test.ts
+++ b/tests/api-contact.test.ts
@@ -8,7 +8,7 @@ const { mockCreate, mockSendEmail } = vi.hoisted(() => ({
 
 // Mock Nodemailer
 const { mockSendMail } = vi.hoisted(() => ({
-  mockSendMail: vi.fn(),
+  mockSendMail: vi.fn().mockResolvedValue({ messageId: "mock-message-id" }),
 }));
 
 vi.mock("nodemailer", () => ({