diff --git a/web/core/components/issues/issue-modal/base.tsx b/web/core/components/issues/issue-modal/base.tsx
index cb638da638..d18f8d3fe7 100644
--- a/web/core/components/issues/issue-modal/base.tsx
+++ b/web/core/components/issues/issue-modal/base.tsx
@@ -66,7 +66,11 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
   const { issues } = useIssues(storeType);
   const { issues: projectIssues } = useIssues(EIssuesStoreType.PROJECT);
   const { issues: draftIssues } = useIssues(EIssuesStoreType.WORKSPACE_DRAFT);
-  const { fetchIssue, removeSubIssue } = useIssueDetail();
+  const {
+    issue: { getIssueById },
+    fetchIssue,
+    removeSubIssue,
+  } = useIssueDetail();
   const { removeSubIssue: removeEpicSubIssue } = useIssueDetail(EIssueServiceType.EPICS);
   const { handleCreateUpdatePropertyValues } = useIssueModal();
   const { getIssueTypeById } = useIssueTypes();
@@ -265,7 +269,8 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
     try {
       // check for parent change
       if (data?.parent_id && payload?.parent_id && payload?.parent_id !== data?.parent_id) {
-        const isParentEpic = getIssueTypeById(data?.parent_id || "")?.is_epic;
+        const parentIssue = getIssueById(payload?.parent_id);
+        const isParentEpic = getIssueTypeById(parentIssue?.type_id || "")?.is_epic;
         if (isParentEpic)
           await removeEpicSubIssue(workspaceSlug?.toString(), payload.project_id, data.parent_id, data.id);
         else await removeSubIssue(workspaceSlug?.toString(), payload.project_id, data.parent_id, data.id);
diff --git a/web/core/store/issue/issue-details/sub_issues.store.ts b/web/core/store/issue/issue-details/sub_issues.store.ts
index e578057e3a..040e658e30 100644
--- a/web/core/store/issue/issue-details/sub_issues.store.ts
+++ b/web/core/store/issue/issue-details/sub_issues.store.ts
@@ -282,7 +282,7 @@ export class IssueSubIssuesStore implements IIssueSubIssuesStore {
       set(
         this.rootIssueDetailStore.rootIssueStore.issues.issuesMap,
         [parentIssueId, "sub_issues_count"],
-        this.subIssues[parentIssueId]?.length || 0
+        this.subIssues[parentIssueId]?.length
       );
     });
 
@@ -319,7 +319,7 @@ export class IssueSubIssuesStore implements IIssueSubIssuesStore {
       set(
         this.rootIssueDetailStore.rootIssueStore.issues.issuesMap,
         [parentIssueId, "sub_issues_count"],
-        this.subIssues[parentIssueId]?.length || 0
+        this.subIssues[parentIssueId]?.length
       );
     });