diff --git a/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx b/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx
index 387a3269fd..f3ff2925be 100644
--- a/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx
+++ b/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx
@@ -83,7 +83,9 @@ const MakeDecision = ({ data }) => {
     suggestChoice: {},
     historyChoice: historyItems.find(
       (item) =>
-        item.id !== itemData.id && !item.issue?.issueType.startsWith(TO_INVESTIGATE_LOCATOR_PREFIX),
+        item.id !== itemData.id &&
+        item.issue &&
+        !item.issue.issueType.startsWith(TO_INVESTIGATE_LOCATOR_PREFIX),
     ),
     commentOption: isBulkOperation ? NOT_CHANGED_FOR_ALL : REPLACE_FOR_ALL,
     extraAnalyticsParams: {