diff --git a/web/app/[workspaceSlug]/(pages)/pages/layout.tsx b/web/app/[workspaceSlug]/(pages)/pages/layout.tsx
index 9b14a5c094..7cec2731cc 100644
--- a/web/app/[workspaceSlug]/(pages)/pages/layout.tsx
+++ b/web/app/[workspaceSlug]/(pages)/pages/layout.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 // layouts
+import { useParams } from "next/navigation";
 import { WorkspaceAuthWrapper } from "@/layouts/auth-layout";
 // wrappers
 import { AuthenticationWrapper } from "@/lib/wrappers";
@@ -12,10 +13,17 @@ import { WorkspacePagesUpgrade } from "@/plane-web/components/pages";
 import { PagesAppSidebar } from "./sidebar";
 
 export default function WorkspacePagesLayout({ children }: { children: React.ReactNode }) {
+  // router
+  const { workspaceSlug } = useParams();
+
   return (
     <AuthenticationWrapper>
       <WorkspaceAuthWrapper>
-        <WithFeatureFlagHOC flag="WORKSPACE_PAGES" fallback={<WorkspacePagesUpgrade />}>
+        <WithFeatureFlagHOC
+          workspaceSlug={workspaceSlug?.toString()}
+          flag="WORKSPACE_PAGES"
+          fallback={<WorkspacePagesUpgrade />}
+        >
           <>
             <PagesAppCommandPalette />
             <div className="relative flex h-screen w-full overflow-hidden">
diff --git a/web/app/[workspaceSlug]/(projects)/settings/worklogs/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/worklogs/page.tsx
index 71d2d5b010..f1b57f32b9 100644
--- a/web/app/[workspaceSlug]/(projects)/settings/worklogs/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/settings/worklogs/page.tsx
@@ -43,7 +43,11 @@ const WorklogsPage = observer(() => {
   return (
     <>
       <PageHead title={pageTitle} />
-      <WithFeatureFlagHOC flag={E_FEATURE_FLAGS.ISSUE_WORKLOG} fallback={<WorkspaceWorklogsUpgrade />}>
+      <WithFeatureFlagHOC
+        workspaceSlug={workspaceSlug?.toString()}
+        flag={E_FEATURE_FLAGS.ISSUE_WORKLOG}
+        fallback={<WorkspaceWorklogsUpgrade />}
+      >
         <WorkspaceWorklogRoot workspaceSlug={workspaceSlug.toString()} workspaceId={currentWorkspace.id} />
       </WithFeatureFlagHOC>
     </>
diff --git a/web/ee/components/active-cycles/root.tsx b/web/ee/components/active-cycles/root.tsx
index b103e8c5f5..24ad1723f7 100644
--- a/web/ee/components/active-cycles/root.tsx
+++ b/web/ee/components/active-cycles/root.tsx
@@ -1,9 +1,19 @@
+import { useParams } from "next/navigation";
 // plane web components
 import { WorkspaceActiveCyclesList, WorkspaceActiveCyclesUpgrade } from "@/plane-web/components/active-cycles";
 import { WithFeatureFlagHOC } from "@/plane-web/components/feature-flags";
 
-export const WorkspaceActiveCyclesRoot = () => (
-  <WithFeatureFlagHOC flag="WORKSPACE_ACTIVE_CYCLES" fallback={<WorkspaceActiveCyclesUpgrade />}>
-    <WorkspaceActiveCyclesList />
-  </WithFeatureFlagHOC>
-)
+export const WorkspaceActiveCyclesRoot = () => {
+  // router
+  const { workspaceSlug } = useParams();
+
+  return (
+    <WithFeatureFlagHOC
+      workspaceSlug={workspaceSlug?.toString()}
+      flag="WORKSPACE_ACTIVE_CYCLES"
+      fallback={<WorkspaceActiveCyclesUpgrade />}
+    >
+      <WorkspaceActiveCyclesList />
+    </WithFeatureFlagHOC>
+  );
+};
diff --git a/web/ee/components/feature-flags/with-feature-flag-hoc.tsx b/web/ee/components/feature-flags/with-feature-flag-hoc.tsx
index 01564744d8..7d49b5dad9 100644
--- a/web/ee/components/feature-flags/with-feature-flag-hoc.tsx
+++ b/web/ee/components/feature-flags/with-feature-flag-hoc.tsx
@@ -12,7 +12,7 @@ interface IWithFeatureFlagHOC {
 
 export const WithFeatureFlagHOC = observer((props: IWithFeatureFlagHOC) => {
   const { workspaceSlug, flag, fallback, children } = props;
-  // check if the feature flag is enableds
+  // check if the feature flag is enabled
   const isFeatureEnabled = useFlag(workspaceSlug, flag);
   // return the children if the feature flag is enabled else return the fallback
   return <>{isFeatureEnabled ? children : fallback}</>;
diff --git a/web/ee/store/workspace-worklog/workspace-worklog.store.ts b/web/ee/store/workspace-worklog/workspace-worklog.store.ts
index 781e483e6b..1163693be6 100644
--- a/web/ee/store/workspace-worklog/workspace-worklog.store.ts
+++ b/web/ee/store/workspace-worklog/workspace-worklog.store.ts
@@ -128,7 +128,9 @@ export class WorkspaceWorklogStore implements IWorkspaceWorklogStore {
    * @returns { boolean }
    */
   get isFeatureFlagEnabled(): boolean {
-    return this.store.featureFlags.flags[E_FEATURE_FLAGS.ISSUE_WORKLOG] || false;
+    const workspaceSlug = this.store.router.workspaceSlug;
+    if (!workspaceSlug) return false;
+    return this.store.featureFlags.flags[workspaceSlug]?.[E_FEATURE_FLAGS.ISSUE_WORKLOG] || false;
   }
 
   // computed functions