diff --git a/apps/server/src/controllers/CaldavController.ts b/apps/server/src/controllers/CaldavController.ts
index 3d0d2c4..a389208 100644
--- a/apps/server/src/controllers/CaldavController.ts
+++ b/apps/server/src/controllers/CaldavController.ts
@@ -15,7 +15,7 @@ export class CaldavController {
       const response = await this.caldavService.saveConfig(config);
       res.json(response);
     } catch (error) {
-      log.error({ error, userId: req.user?.userId }, "Error saving config");
+      log.error({ err: error, userId: req.user?.userId }, "Error saving config");
       res.status(500).json({ error: "Failed to save config" });
     }
   }
@@ -30,7 +30,7 @@ export class CaldavController {
       // Don't expose the password to the client
       res.json(config);
     } catch (error) {
-      log.error({ error, userId: req.user?.userId }, "Error loading config");
+      log.error({ err: error, userId: req.user?.userId }, "Error loading config");
       res.status(500).json({ error: "Failed to load config" });
     }
   }
@@ -40,7 +40,7 @@ export class CaldavController {
       await this.caldavService.deleteConfig(req.user!.userId);
       res.status(204).send();
     } catch (error) {
-      log.error({ error, userId: req.user?.userId }, "Error deleting config");
+      log.error({ err: error, userId: req.user?.userId }, "Error deleting config");
       res.status(500).json({ error: "Failed to delete config" });
     }
   }
@@ -50,7 +50,7 @@ export class CaldavController {
       const events = await this.caldavService.pullEvents(req.user!.userId);
       res.json(events);
     } catch (error) {
-      log.error({ error, userId: req.user?.userId }, "Error pulling events");
+      log.error({ err: error, userId: req.user?.userId }, "Error pulling events");
       res.status(500).json({ error: "Failed to pull events" });
     }
   }
@@ -60,7 +60,7 @@ export class CaldavController {
       await this.caldavService.pushAll(req.user!.userId);
       res.status(204).send();
     } catch (error) {
-      log.error({ error, userId: req.user?.userId }, "Error pushing events");
+      log.error({ err: error, userId: req.user?.userId }, "Error pushing events");
       res.status(500).json({ error: "Failed to push events" });
     }
   }
@@ -78,7 +78,7 @@ export class CaldavController {
       await this.caldavService.pushEvent(req.user!.userId, event);
       res.status(204).send();
     } catch (error) {
-      log.error({ error, userId: req.user?.userId }, "Error pushing event");
+      log.error({ err: error, userId: req.user?.userId }, "Error pushing event");
       res.status(500).json({ error: "Failed to push event" });
     }
   }
diff --git a/apps/server/src/controllers/ChatController.ts b/apps/server/src/controllers/ChatController.ts
index fd4a1dc..e25c4eb 100644
--- a/apps/server/src/controllers/ChatController.ts
+++ b/apps/server/src/controllers/ChatController.ts
@@ -28,7 +28,7 @@ export class ChatController {
       res.json(response);
     } catch (error) {
       log.error(
-        { error, userId: req.user?.userId },
+        { err: error, userId: req.user?.userId },
         "Error processing message",
       );
       res.status(500).json({ error: "Failed to process message" });
@@ -79,13 +79,13 @@ export class ChatController {
           await this.caldavService.pushAll(userId);
         }
       } catch (error) {
-        log.error({ error, userId }, "CalDAV push after confirm failed");
+        log.error({ err: error, userId }, "CalDAV push after confirm failed");
       }
 
       res.json(response);
     } catch (error) {
       log.error(
-        { error, conversationId: req.params.conversationId },
+        { err: error, conversationId: req.params.conversationId },
         "Error confirming event",
       );
       res.status(500).json({ error: "Failed to confirm event" });
@@ -106,7 +106,7 @@ export class ChatController {
       res.json(response);
     } catch (error) {
       log.error(
-        { error, conversationId: req.params.conversationId },
+        { err: error, conversationId: req.params.conversationId },
         "Error rejecting event",
       );
       res.status(500).json({ error: "Failed to reject event" });
@@ -123,7 +123,7 @@ export class ChatController {
       res.json(conversations);
     } catch (error) {
       log.error(
-        { error, userId: req.user?.userId },
+        { err: error, userId: req.user?.userId },
         "Error getting conversations",
       );
       res.status(500).json({ error: "Failed to get conversations" });
@@ -157,7 +157,7 @@ export class ChatController {
         res.status(404).json({ error: "Conversation not found" });
       } else {
         log.error(
-          { error, conversationId: req.params.id },
+          { err: error, conversationId: req.params.id },
           "Error getting conversation",
         );
         res.status(500).json({ error: "Failed to get conversation" });
@@ -187,7 +187,7 @@ export class ChatController {
       }
     } catch (error) {
       log.error(
-        { error, messageId: req.params.messageId },
+        { err: error, messageId: req.params.messageId },
         "Error updating proposal event",
       );
       res.status(500).json({ error: "Failed to update proposal event" });
diff --git a/apps/server/src/controllers/EventController.ts b/apps/server/src/controllers/EventController.ts
index f01900d..0aa5478 100644
--- a/apps/server/src/controllers/EventController.ts
+++ b/apps/server/src/controllers/EventController.ts
@@ -18,7 +18,7 @@ export class EventController {
       try {
         await this.caldavService.pushEvent(userId, event);
       } catch (error) {
-        log.error({ error, userId }, "Error pushing event to CalDAV");
+        log.error({ err: error, userId }, "Error pushing event to CalDAV");
       }
     }
   }
@@ -28,7 +28,7 @@ export class EventController {
       try {
         await this.caldavService.deleteEvent(userId, event.caldavUUID);
       } catch (error) {
-        log.error({ error, userId }, "Error deleting event from CalDAV");
+        log.error({ err: error, userId }, "Error deleting event from CalDAV");
       }
     }
   }
@@ -40,7 +40,7 @@ export class EventController {
       await this.pushToCaldav(userId, event);
       res.status(201).json(event);
     } catch (error) {
-      log.error({ error, userId: req.user?.userId }, "Error creating event");
+      log.error({ err: error, userId: req.user?.userId }, "Error creating event");
       res.status(500).json({ error: "Failed to create event" });
     }
   }
@@ -57,7 +57,7 @@ export class EventController {
       }
       res.json(event);
     } catch (error) {
-      log.error({ error, eventId: req.params.id }, "Error getting event");
+      log.error({ err: error, eventId: req.params.id }, "Error getting event");
       res.status(500).json({ error: "Failed to get event" });
     }
   }
@@ -67,7 +67,7 @@ export class EventController {
       const events = await this.eventService.getAll(req.user!.userId);
       res.json(events);
     } catch (error) {
-      log.error({ error, userId: req.user?.userId }, "Error getting events");
+      log.error({ err: error, userId: req.user?.userId }, "Error getting events");
       res.status(500).json({ error: "Failed to get events" });
     }
   }
@@ -100,7 +100,7 @@ export class EventController {
       res.json(events);
     } catch (error) {
       log.error(
-        { error, start: req.query.start, end: req.query.end },
+        { err: error, start: req.query.start, end: req.query.end },
         "Error getting events by range",
       );
       res.status(500).json({ error: "Failed to get events" });
@@ -124,7 +124,7 @@ export class EventController {
 
       res.json(event);
     } catch (error) {
-      log.error({ error, eventId: req.params.id }, "Error updating event");
+      log.error({ err: error, eventId: req.params.id }, "Error updating event");
       res.status(500).json({ error: "Failed to update event" });
     }
   }
@@ -171,7 +171,7 @@ export class EventController {
       await this.deleteFromCaldav(userId, event);
       res.status(204).send();
     } catch (error) {
-      log.error({ error, eventId: req.params.id }, "Error deleting event");
+      log.error({ err: error, eventId: req.params.id }, "Error deleting event");
       res.status(500).json({ error: "Failed to delete event" });
     }
   }