diff --git a/server/src/routes/initiative.ts b/server/src/routes/initiative.ts
index cc8720b..c568f58 100644
--- a/server/src/routes/initiative.ts
+++ b/server/src/routes/initiative.ts
@@ -113,7 +113,7 @@ async function tickDeathTimers(io: Server, campaignId: number): Promise<void> {
   );
   if (charRows.length === 0) return;
 
-  const charIds = (charRows as RowDataPacket[]).map((r) => r.id as number);
+  const charIds = charRows.map((r) => r.id as number);
   const placeholders = charIds.map(() => "?").join(", ");
 
   const [dyingRows] = await db.execute<RowDataPacket[]>(
@@ -145,6 +145,7 @@ async function tickDeathTimers(io: Server, campaignId: number): Promise<void> {
       "SELECT * FROM character_conditions WHERE character_id = ?",
       [condition.character_id]
     );
+    if (!charRow[0]) continue;
     io.to(`campaign:${campaignId}`).emit("character:updated", {
       ...charRow[0],
       conditions: updatedConditions,