diff --git a/apps/web/components/pages/task/title-block/task-title-block.tsx b/apps/web/components/pages/task/title-block/task-title-block.tsx
index a51599fc6..c3461296a 100644
--- a/apps/web/components/pages/task/title-block/task-title-block.tsx
+++ b/apps/web/components/pages/task/title-block/task-title-block.tsx
@@ -222,10 +222,12 @@ const TaskTitleBlock = () => {
 						)} */}
 						{/* Parent Issue/Task Name */}
 
+						{/* Current Issue Type is Task|Bug and Parent Issue is Not an Epic */}
 						{(!task?.issueType ||
 							task?.issueType === 'Task' ||
 							task?.issueType === 'Bug') &&
-							task?.rootEpic && (
+							task?.rootEpic &&
+							task?.parentId !== task?.rootEpic.id && (
 								<ParentTaskBadge
 									task={{
 										...task,
diff --git a/apps/web/lib/features/task/task-input.tsx b/apps/web/lib/features/task/task-input.tsx
index ee528e7e3..e71c16f33 100644
--- a/apps/web/lib/features/task/task-input.tsx
+++ b/apps/web/lib/features/task/task-input.tsx
@@ -228,10 +228,22 @@ export function TaskInput(props: Props) {
 
 	let updatedTaskList: ITeamTask[] = [];
 	if (props.forParentChildRelationship) {
-		if (props.task?.issueType === 'Story') {
+		if (
+			// Story can have ParentId set to Epic ID
+			props.task?.issueType === 'Story'
+		) {
 			updatedTaskList = datas.filteredTasks.filter(
 				(item) => item.issueType === 'Epic'
 			);
+		} else if (
+			// TASK|BUG can have ParentId to be set either to Story ID or Epic ID
+			props.task?.issueType === 'Task' ||
+			props.task?.issueType === 'Bug' ||
+			!props.task?.issueType
+		) {
+			updatedTaskList = datas.filteredTasks.filter(
+				(item) => item.issueType === 'Epic' || item.issueType === 'Story'
+			);
 		} else {
 			updatedTaskList = datas.filteredTasks;
 		}