diff --git a/apiserver/plane/ee/views/app/teamspace/analytic.py b/apiserver/plane/ee/views/app/teamspace/analytic.py
index ddba2cb289..6cce9129e2 100644
--- a/apiserver/plane/ee/views/app/teamspace/analytic.py
+++ b/apiserver/plane/ee/views/app/teamspace/analytic.py
@@ -31,7 +31,7 @@ class TeamspaceEntitiesEndpoint(TeamspaceBaseEndpoint):
     def get(self, request, slug, team_space_id):
         # Get team entities count
         team_page_count = TeamspacePage.objects.filter(
-            team_space_id=team_space_id, page__access=0
+            team_space_id=team_space_id, page__access=0, page__archived_at__isnull=True
         ).count()
         team_view_count = TeamspaceView.objects.filter(
             team_space_id=team_space_id, view__access=1
@@ -46,14 +46,20 @@ class TeamspaceEntitiesEndpoint(TeamspaceBaseEndpoint):
             team_space_id=team_space_id
         ).values_list("member_id", flat=True)
 
-        issue_count = Issue.objects.filter(
+        issue_ids = IssueAssignee.objects.filter(
+            workspace__slug=slug, assignee_id__in=team_member_ids
+        ).values_list("issue_id", flat=True)
+
+        issue_count = Issue.issue_objects.filter(
+            id__in=issue_ids,
             project_id__in=project_ids,
             workspace__slug=slug,
-            assignees__id__in=team_member_ids,
         ).count()
 
         cycles_count = Cycle.objects.filter(
-            project_id__in=project_ids, workspace__slug=slug
+            project_id__in=project_ids,
+            workspace__slug=slug,
+            archived_at__isnull=True,
         ).count()
 
         return Response(
diff --git a/apiserver/plane/ee/views/app/teamspace/issue.py b/apiserver/plane/ee/views/app/teamspace/issue.py
index bb1185129d..5810222ae2 100644
--- a/apiserver/plane/ee/views/app/teamspace/issue.py
+++ b/apiserver/plane/ee/views/app/teamspace/issue.py
@@ -47,7 +47,11 @@ class TeamspaceIssueEndpoint(TeamspaceBaseEndpoint):
         order_by_param = request.GET.get("order_by", "created_at")
         filters = issue_filters(request.query_params, "GET")
         issue_queryset = (
-            Issue.issue_objects.filter(workspace__slug=slug, id__in=issue_ids)
+            Issue.issue_objects.filter(
+                workspace__slug=slug,
+                id__in=issue_ids,
+                project_id__in=accessible_project_ids,
+            )
             .filter(**filters)
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related(
@@ -82,7 +86,6 @@ class TeamspaceIssueEndpoint(TeamspaceBaseEndpoint):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .filter(project_id__in=accessible_project_ids)
         )
 
         # Issue queryset