diff --git a/apps/portal/src/server/router/questions-question-encounter-router.ts b/apps/portal/src/server/router/questions-question-encounter-router.ts
index 8102b466..9612d076 100644
--- a/apps/portal/src/server/router/questions-question-encounter-router.ts
+++ b/apps/portal/src/server/router/questions-question-encounter-router.ts
@@ -79,6 +79,13 @@ export const questionsQuestionEncounterRouter = createProtectedRouter()
           },
         });
 
+        if (questionToUpdate === null) {
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'Question does not exist',
+          });
+        }
+
         if (questionToUpdate!.lastSeenAt < input.seenAt) {
           await tx.questionsQuestion.update({
             data: {