diff --git a/web/ce/constants/issues.ts b/web/ce/constants/issues.ts
index d30ec492e56..dc6ffbcb8c2 100644
--- a/web/ce/constants/issues.ts
+++ b/web/ce/constants/issues.ts
@@ -31,7 +31,4 @@ export const filterActivityOnSelectedFilters = (
 ): TIssueActivityComment[] =>
   activity.filter((activity) => filter.includes(activity.activity_type as TActivityFilters));
 
-// boolean to decide if the local db cache is enabled
-export const ENABLE_LOCAL_DB_CACHE = false;
-
 export const ENABLE_ISSUE_DEPENDENCIES = false;
diff --git a/web/core/components/workspace/sidebar/help-section.tsx b/web/core/components/workspace/sidebar/help-section.tsx
index 5570b5727a0..54df5909e8d 100644
--- a/web/core/components/workspace/sidebar/help-section.tsx
+++ b/web/core/components/workspace/sidebar/help-section.tsx
@@ -16,7 +16,6 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import { PlaneVersionNumber } from "@/plane-web/components/global";
 import { WorkspaceEditionBadge } from "@/plane-web/components/workspace";
-import { ENABLE_LOCAL_DB_CACHE } from "@/plane-web/constants/issues";
 
 export interface WorkspaceHelpSectionProps {
   setSidebarActive?: React.Dispatch<React.SetStateAction<boolean>>;
@@ -111,23 +110,21 @@ export const SidebarHelpSection: React.FC<WorkspaceHelpSectionProps> = observer(
               </a>
             </CustomMenu.MenuItem>
             <div className="my-1 border-t border-custom-border-200" />
-            {ENABLE_LOCAL_DB_CACHE && (
-              <CustomMenu.MenuItem>
-                <div
-                  onClick={(e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                  }}
-                  className="flex w-full items-center justify-between text-xs hover:bg-custom-background-80"
-                >
-                  <span className="racking-tight">Local Cache</span>
-                  <ToggleSwitch
-                    value={canUseLocalDB}
-                    onChange={() => toggleLocalDB(workspaceSlug?.toString(), projectId?.toString())}
-                  />
-                </div>
-              </CustomMenu.MenuItem>
-            )}
+            <CustomMenu.MenuItem>
+              <div
+                onClick={(e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                }}
+                className="flex w-full items-center justify-between text-xs hover:bg-custom-background-80"
+              >
+                <span className="racking-tight">Local Cache</span>
+                <ToggleSwitch
+                  value={canUseLocalDB}
+                  onChange={() => toggleLocalDB(workspaceSlug?.toString(), projectId?.toString())}
+                />
+              </div>
+            </CustomMenu.MenuItem>
             <CustomMenu.MenuItem>
               <button
                 type="button"
@@ -173,8 +170,9 @@ export const SidebarHelpSection: React.FC<WorkspaceHelpSectionProps> = observer(
           <Tooltip tooltipContent={`${isCollapsed ? "Expand" : "Hide"}`} isMobile={isMobile}>
             <button
               type="button"
-              className={`grid place-items-center rounded-md p-1 text-custom-text-200 outline-none hover:bg-custom-background-90 hover:text-custom-text-100 ${isCollapsed ? "w-full" : ""
-                }`}
+              className={`grid place-items-center rounded-md p-1 text-custom-text-200 outline-none hover:bg-custom-background-90 hover:text-custom-text-100 ${
+                isCollapsed ? "w-full" : ""
+              }`}
               onClick={() => toggleSidebar()}
             >
               <MoveLeft className={`h-4 w-4 duration-300 ${isCollapsed ? "rotate-180" : ""}`} />
diff --git a/web/core/services/issue/issue.service.ts b/web/core/services/issue/issue.service.ts
index 2cef113d80f..d74ce0c88ff 100644
--- a/web/core/services/issue/issue.service.ts
+++ b/web/core/services/issue/issue.service.ts
@@ -1,5 +1,3 @@
-import { startSpan } from "@sentry/nextjs";
-import isEmpty from "lodash/isEmpty";
 // types
 import type {
   IIssueDisplayProperties,
@@ -12,6 +10,7 @@ import type {
 } from "@plane/types";
 // helpers
 import { API_BASE_URL } from "@/helpers/common.helper";
+import { getIssuesShouldFallbackToServer } from "@/helpers/issue.helper";
 import { persistence } from "@/local-db/storage.sqlite";
 // services
 
@@ -68,7 +67,7 @@ export class IssueService extends APIService {
   }
 
   async getIssues(workspaceSlug: string, projectId: string, queries?: any, config = {}): Promise<TIssuesResponse> {
-    if (!isEmpty(queries.expand as string) && !queries.group_by)
+    if (getIssuesShouldFallbackToServer(queries))
       return await this.getIssuesFromServer(workspaceSlug, projectId, queries, config);
 
     const response = await persistence.getIssues(workspaceSlug, projectId, queries, config);
diff --git a/web/core/store/user/index.ts b/web/core/store/user/index.ts
index 008f25af33e..eac764a3db3 100644
--- a/web/core/store/user/index.ts
+++ b/web/core/store/user/index.ts
@@ -9,7 +9,6 @@ import { TUserPermissions } from "@plane/types/src/enums";
 import { API_BASE_URL } from "@/helpers/common.helper";
 // local
 import { persistence } from "@/local-db/storage.sqlite";
-import { ENABLE_LOCAL_DB_CACHE } from "@/plane-web/constants/issues";
 import { EUserPermissions } from "@/plane-web/constants/user-permissions";
 // services
 import { AuthService } from "@/services/auth.service";
@@ -278,6 +277,6 @@ export class UserStore implements IUserStore {
   }
 
   get localDBEnabled() {
-    return ENABLE_LOCAL_DB_CACHE && this.userSettings.canUseLocalDB;
+    return this.userSettings.canUseLocalDB;
   }
 }
diff --git a/web/helpers/issue.helper.ts b/web/helpers/issue.helper.ts
index d1fc970185e..695d124d049 100644
--- a/web/helpers/issue.helper.ts
+++ b/web/helpers/issue.helper.ts
@@ -1,4 +1,5 @@
 import differenceInCalendarDays from "date-fns/differenceInCalendarDays";
+import isEmpty from "lodash/isEmpty";
 import set from "lodash/set";
 import { v4 as uuidv4 } from "uuid";
 // types
@@ -308,3 +309,17 @@ export const getComputedDisplayProperties = (
   cycle: displayProperties?.cycle ?? true,
   issue_type: displayProperties?.issue_type ?? true,
 });
+
+/**
+ * This is to check if the issues list api should fall back to server or use local db
+ * @param queries
+ * @returns
+ */
+export const getIssuesShouldFallbackToServer = (queries: any) => {
+  // If there is expand query and is not grouped then fallback to server
+  if (!isEmpty(queries.expand as string) && !queries.group_by) return true;
+  // If query has mentions then fallback to server
+  if (!isEmpty(queries.mentions)) return true;
+
+  return false;
+};