diff --git a/components/notifications/answer-modal.tsx b/components/notifications/answer-modal.tsx
index 0123271..8a8d05b 100644
--- a/components/notifications/answer-modal.tsx
+++ b/components/notifications/answer-modal.tsx
@@ -115,7 +115,7 @@ export function AnswerModal({ question, isDemo, onClose }: AnswerModalProps) {
               {question.question}
             </div>
 
-            {question.options && question.options.length > 0 && (
+            {question.options?.length ? (
               <div className="space-y-2">
                 <p className="text-muted-foreground text-xs">Kies een van de opties:</p>
                 <div className="flex flex-col gap-2">
@@ -134,12 +134,12 @@ export function AnswerModal({ question, isDemo, onClose }: AnswerModalProps) {
                   ))}
                 </div>
               </div>
-            )}
+            ) : null}
 
-            <div className={question.options && question.options.length > 0 ? 'space-y-1 border-t pt-4' : 'space-y-1'}>
-              {question.options && question.options.length > 0 && (
+            <div className={question.options?.length ? 'space-y-1 border-t pt-4' : 'space-y-1'}>
+              {question.options?.length ? (
                 <p className="text-muted-foreground text-xs">Of typ een eigen antwoord</p>
-              )}
+              ) : null}
               <Textarea
                 value={answer}
                 onChange={(e) => setAnswer(e.target.value)}