diff --git a/src/events/projectors/service-session-projector.ts b/src/events/projectors/service-session-projector.ts
index 40d969a..c6e4aac 100644
--- a/src/events/projectors/service-session-projector.ts
+++ b/src/events/projectors/service-session-projector.ts
@@ -61,9 +61,9 @@ export async function applyServiceSessionProjection(event: GrowEventRow) {
         .where(and(eq(growActiveMissions.userId, event.userId), eq(growActiveMissions.instanceId, missionInstanceId)))
         .limit(1)
     : [];
-  const linkedMissionInstanceId = activeMission?.instanceId ?? missionInstanceId;
-  const linkedMissionId = linkedMissionInstanceId ? missionId ?? activeMission?.missionId : undefined;
-  const linkedStageId = linkedMissionInstanceId ? stageId ?? activeMission?.currentStageId ?? undefined : undefined;
+  const linkedMissionInstanceId = activeMission?.instanceId;
+  const linkedMissionId = missionId ?? activeMission?.missionId;
+  const linkedStageId = stageId ?? activeMission?.currentStageId ?? undefined;
   const metadata = {
     lastType: event.type,
     subject: event.subject,