diff --git a/web/components/issues/issue-layouts/roots/cycle-layout-root.tsx b/web/components/issues/issue-layouts/roots/cycle-layout-root.tsx
index 0f32e71c2..3e07d16fc 100644
--- a/web/components/issues/issue-layouts/roots/cycle-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/cycle-layout-root.tsx
@@ -61,13 +61,13 @@ export const CycleLayoutRoot: React.FC = observer(() => {
         {cycleStatus === "completed" && <TransferIssues handleClick={() => setTransferIssuesModal(true)} />}
         <CycleAppliedFiltersRoot />
 
-        {issues?.loader === "init-loader" ? (
+        {issues?.loader === "init-loader" || !issues?.groupedIssueIds ? (
           <div className="flex h-full w-full items-center justify-center">
             <Spinner />
           </div>
         ) : (
           <>
-            {!issues?.groupedIssueIds ? (
+            {issues?.groupedIssueIds?.length === 0 ? (
               <CycleEmptyState
                 workspaceSlug={workspaceSlug.toString()}
                 projectId={projectId.toString()}
diff --git a/web/components/issues/issue-layouts/roots/module-layout-root.tsx b/web/components/issues/issue-layouts/roots/module-layout-root.tsx
index 808cad91b..10db13e49 100644
--- a/web/components/issues/issue-layouts/roots/module-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/module-layout-root.tsx
@@ -51,13 +51,13 @@ export const ModuleLayoutRoot: React.FC = observer(() => {
     <div className="relative flex h-full w-full flex-col overflow-hidden">
       <ModuleAppliedFiltersRoot />
 
-      {issues?.loader === "init-loader" ? (
+      {issues?.loader === "init-loader" || !issues?.groupedIssueIds ? (
         <div className="flex h-full w-full items-center justify-center">
           <Spinner />
         </div>
       ) : (
         <>
-          {!issues?.groupedIssueIds ? (
+          {issues?.groupedIssueIds?.length === 0 ? (
             <ModuleEmptyState
               workspaceSlug={workspaceSlug.toString()}
               projectId={projectId.toString()}
diff --git a/web/components/issues/issue-layouts/roots/project-layout-root.tsx b/web/components/issues/issue-layouts/roots/project-layout-root.tsx
index 1edba5563..ddc1e9917 100644
--- a/web/components/issues/issue-layouts/roots/project-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/project-layout-root.tsx
@@ -45,13 +45,13 @@ export const ProjectLayoutRoot: FC = observer(() => {
     <div className="relative flex h-full w-full flex-col overflow-hidden">
       <ProjectAppliedFiltersRoot />
 
-      {issues?.loader === "init-loader" ? (
+      {issues?.loader === "init-loader" || !issues?.groupedIssueIds ? (
         <div className="flex h-full w-full items-center justify-center">
           <Spinner />
         </div>
       ) : (
         <>
-          {!issues?.groupedIssueIds ? (
+          {issues?.groupedIssueIds?.length === 0 ? (
             <div className="relative h-full w-full overflow-y-auto">
               <ProjectEmptyState />
             </div>
diff --git a/web/components/issues/issue-layouts/roots/project-view-layout-root.tsx b/web/components/issues/issue-layouts/roots/project-view-layout-root.tsx
index d3d4f0417..75ac2bd9e 100644
--- a/web/components/issues/issue-layouts/roots/project-view-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/project-view-layout-root.tsx
@@ -67,13 +67,13 @@ export const ProjectViewLayoutRoot: React.FC = observer(() => {
     <div className="relative flex h-full w-full flex-col overflow-hidden">
       <ProjectViewAppliedFiltersRoot />
 
-      {issues?.loader === "init-loader" ? (
+      {issues?.loader === "init-loader" || !issues?.groupedIssueIds ? (
         <div className="flex h-full w-full items-center justify-center">
           <Spinner />
         </div>
       ) : (
         <>
-          {!issues?.groupedIssueIds ? (
+          {issues?.groupedIssueIds?.length === 0 ? (
             <ProjectViewEmptyState />
           ) : (
             <>
diff --git a/web/constants/dashboard.ts b/web/constants/dashboard.ts
index 219601660..d23480cfe 100644
--- a/web/constants/dashboard.ts
+++ b/web/constants/dashboard.ts
@@ -243,7 +243,7 @@ export const SIDEBAR_MENU_ITEMS: {
     label: "All Issues",
     href: `/workspace-views/all-issues`,
     access: EUserWorkspaceRoles.GUEST,
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/workspace-views/all-issues`,
+    highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/workspace-views`),
     Icon: CheckCircle,
   },
   {
diff --git a/web/store/issue/cycle/issue.store.ts b/web/store/issue/cycle/issue.store.ts
index 5519aa045..70be07f24 100644
--- a/web/store/issue/cycle/issue.store.ts
+++ b/web/store/issue/cycle/issue.store.ts
@@ -117,12 +117,13 @@ export class CycleIssues extends IssueHelperStore implements ICycleIssues {
     const orderBy = displayFilters?.order_by;
     const layout = displayFilters?.layout;
 
-    const cycleIssueIds = this.issues[cycleId] ?? [];
+    const cycleIssueIds = this.issues[cycleId];
+    if (!cycleIssueIds) return;
 
     const _issues = this.rootIssueStore.issues.getIssuesByIds(cycleIssueIds);
-    if (!_issues) return undefined;
+    if (!_issues) return [];
 
-    let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues | undefined = undefined;
+    let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues = [];
 
     if (layout === "list" && orderBy) {
       if (groupBy) issues = this.groupedIssues(groupBy, orderBy, _issues);
diff --git a/web/store/issue/module/issue.store.ts b/web/store/issue/module/issue.store.ts
index 4a51bdc0a..ce17a54da 100644
--- a/web/store/issue/module/issue.store.ts
+++ b/web/store/issue/module/issue.store.ts
@@ -110,12 +110,13 @@ export class ModuleIssues extends IssueHelperStore implements IModuleIssues {
     const orderBy = displayFilters?.order_by;
     const layout = displayFilters?.layout;
 
-    const moduleIssueIds = this.issues[moduleId] ?? [];
+    const moduleIssueIds = this.issues[moduleId];
+    if (!moduleIssueIds) return;
 
     const _issues = this.rootIssueStore.issues.getIssuesByIds(moduleIssueIds);
-    if (!_issues) return undefined;
+    if (!_issues) return [];
 
-    let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues | undefined = undefined;
+    let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues = [];
 
     if (layout === "list" && orderBy) {
       if (groupBy) issues = this.groupedIssues(groupBy, orderBy, _issues);
diff --git a/web/store/issue/project-views/issue.store.ts b/web/store/issue/project-views/issue.store.ts
index 1908b8a10..d643999c9 100644
--- a/web/store/issue/project-views/issue.store.ts
+++ b/web/store/issue/project-views/issue.store.ts
@@ -95,12 +95,13 @@ export class ProjectViewIssues extends IssueHelperStore implements IProjectViewI
     const orderBy = displayFilters?.order_by;
     const layout = displayFilters?.layout;
 
-    const viewIssueIds = this.issues[viewId] ?? [];
+    const viewIssueIds = this.issues[viewId];
+    if (!viewIssueIds) return;
 
     const _issues = this.rootStore.issues.getIssuesByIds(viewIssueIds);
-    if (!_issues) return undefined;
+    if (!_issues) return [];
 
-    let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues | undefined = undefined;
+    let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues = [];
 
     if (layout === "list" && orderBy) {
       if (groupBy) issues = this.groupedIssues(groupBy, orderBy, _issues);
diff --git a/web/store/issue/project/issue.store.ts b/web/store/issue/project/issue.store.ts
index a375ef5a9..2000a440a 100644
--- a/web/store/issue/project/issue.store.ts
+++ b/web/store/issue/project/issue.store.ts
@@ -75,12 +75,13 @@ export class ProjectIssues extends IssueHelperStore implements IProjectIssues {
     const orderBy = displayFilters?.order_by;
     const layout = displayFilters?.layout;
 
-    const projectIssueIds = this.issues[projectId] ?? [];
+    const projectIssueIds = this.issues[projectId];
+    if (!projectIssueIds) return;
 
     const _issues = this.rootStore.issues.getIssuesByIds(projectIssueIds);
-    if (!_issues) return undefined;
+    if (!_issues) return [];
 
-    let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues | undefined = undefined;
+    let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues = [];
 
     if (layout === "list" && orderBy) {
       if (groupBy) issues = this.groupedIssues(groupBy, orderBy, _issues);