diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
index f1e4683a25..3f829f645d 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
@@ -147,7 +147,7 @@ const ReviewPanelCurrentFile: FC = () => {
 
   const positionsRef = useRef<Map<string, number>>(new Map())
 
-  const addCommentRanges = state.field(addCommentStateField).ranges
+  const addCommentRanges = state.field(addCommentStateField, false)?.ranges
 
   useEffect(() => {
     if (aggregatedRanges) {
@@ -178,6 +178,10 @@ const ReviewPanelCurrentFile: FC = () => {
             }
           }
 
+          if (!addCommentRanges) {
+            return
+          }
+
           const cursor = addCommentRanges.iter()
 
           while (cursor.value) {
@@ -212,6 +216,10 @@ const ReviewPanelCurrentFile: FC = () => {
   )
 
   const addCommentEntries = useMemo(() => {
+    if (!addCommentRanges) {
+      return []
+    }
+
     const cursor = addCommentRanges.iter()
 
     const entries = []