diff --git a/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx b/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx
index 7126526a66..387a3269fd 100644
--- a/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx
+++ b/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx
@@ -390,7 +390,9 @@ const MakeDecision = ({ data }) => {
   const getMakeDecisionTabs = () => {
     const preparedHistoryLineItems = historyItems.filter(
       (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),
     );
 
     const tabsData = [