diff --git a/apiserver/plane/ee/views/app/epic/base.py b/apiserver/plane/ee/views/app/epic/base.py index a9d4f9ff85..8741dd0d76 100644 --- a/apiserver/plane/ee/views/app/epic/base.py +++ b/apiserver/plane/ee/views/app/epic/base.py @@ -175,9 +175,13 @@ class EpicViewSet(BaseViewSet): ArrayAgg( "initiative_epics__initiative_id", distinct=True, + filter=Q( + initiative_epics__deleted_at__isnull=True, + initiative_epics__initiative_id__isnull=False, + ), ), Value([], output_field=ArrayField(UUIDField())), - ), + ) ) .prefetch_related( Prefetch( diff --git a/web/ee/components/initiatives/details/root.tsx b/web/ee/components/initiatives/details/root.tsx index 6fe4423b17..74d15d41f2 100644 --- a/web/ee/components/initiatives/details/root.tsx +++ b/web/ee/components/initiatives/details/root.tsx @@ -121,9 +121,7 @@ export const InitiativeDetailRoot = observer((props: Props) => { setIsEpicModalOpen(false)} handleOnSubmit={async (data) => {