diff --git a/Core/Controllers/NoteController.cs b/Core/Controllers/NoteController.cs
index bc4d3f5a..04d96f0b 100644
--- a/Core/Controllers/NoteController.cs
+++ b/Core/Controllers/NoteController.cs
@@ -53,7 +53,7 @@ public class NoteController(
         NoteActionData body,
         string sessionId)
     {
-        pmcData.Notes.DataNotes.RemoveAt(body.Index.Value);
+        pmcData.Notes?.DataNotes?.RemoveAt(body.Index!.Value);
 
         return _eventOutputHolder.GetOutput(sessionId);
     }