diff --git a/src/entryPoints/hyperswitch/HyperSwitchApp.res b/src/entryPoints/hyperswitch/HyperSwitchApp.res
index c30e406ee..d4b39faa1 100644
--- a/src/entryPoints/hyperswitch/HyperSwitchApp.res
+++ b/src/entryPoints/hyperswitch/HyperSwitchApp.res
@@ -4,19 +4,6 @@ open HSLocalStorage
 open HSwitchGlobalVars
 open APIUtils
 
-module FeatureFlagEnabledComponent = {
-  @react.component
-  let make = (~isEnabled, ~children) => {
-    let {setDashboardPageState} = React.useContext(GlobalProvider.defaultContext)
-    let updateRoute = () => {
-      setDashboardPageState(_ => #HOME)
-      RescriptReactRouter.replace("/home")
-      React.null
-    }
-    <> {isEnabled ? children : updateRoute()} </>
-  }
-}
-
 @react.component
 let make = () => {
   let url = RescriptReactRouter.useUrl()
@@ -249,11 +236,11 @@ let make = () => {
                     <ErrorBoundary>
                       {switch url.path {
                       | list{"home"} =>
-                        <FeatureFlagEnabledComponent isEnabled={featureFlagDetails.default}>
+                        <AccessControl isEnabled={featureFlagDetails.default}>
                           {featureFlagDetails.quickStart ? <HomeV2 /> : <Home />}
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"fraud-risk-management", ...remainingPath} =>
-                        <FeatureFlagEnabledComponent isEnabled={featureFlagDetails.frm}>
+                        <AccessControl isEnabled={featureFlagDetails.frm}>
                           <EntityScaffold
                             entityName="risk-management"
                             remainingPath
@@ -261,7 +248,7 @@ let make = () => {
                             renderNewForm={() => <FRMConfigure />}
                             renderShow={_ => <FRMConfigure />}
                           />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"connectors", ...remainingPath} =>
                         <EntityScaffold
                           entityName="Connectors"
@@ -307,7 +294,7 @@ let make = () => {
                           renderShow={id => <ShowDisputes id />}
                         />
                       | list{"customers", ...remainingPath} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.customersModule>
+                        <AccessControl isEnabled=featureFlagDetails.customersModule>
                           <EntityScaffold
                             entityName="Customers"
                             remainingPath
@@ -315,7 +302,7 @@ let make = () => {
                             renderList={() => <Customers />}
                             renderShow={id => <ShowCustomers id />}
                           />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"routing", ...remainingPath} =>
                         <EntityScaffold
                           entityName="Routing"
@@ -341,12 +328,11 @@ let make = () => {
                           <RefundsAnalytics />
                         </FilterContext>
                       | list{"analytics-user-journey"} =>
-                        <FeatureFlagEnabledComponent
-                          isEnabled=featureFlagDetails.userJourneyAnalytics>
+                        <AccessControl isEnabled=featureFlagDetails.userJourneyAnalytics>
                           <FilterContext key="UserJourneyAnalytics" index="UserJourneyAnalytics">
                             <UserJourneyAnalytics />
                           </FilterContext>
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"monitoring"} => comingSoonPage
                       | list{"developer-api-keys"} => <KeyManagement.KeysManagement />
                       | list{"developer-system-metrics"} =>
@@ -366,31 +352,31 @@ let make = () => {
                             <PaymentSettings webhookOnly=false showFormOnly=false />}
                         />
                       | list{"recon"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.recon>
+                        <AccessControl isEnabled=featureFlagDetails.recon>
                           <Recon />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"sdk"} =>
-                        <FeatureFlagEnabledComponent isEnabled={!featureFlagDetails.isLiveMode}>
+                        <AccessControl isEnabled={!featureFlagDetails.isLiveMode}>
                           <SDKPage />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"3ds"} => <HSwitchThreeDS />
                       | list{"surcharge"} =>
-                        <FeatureFlagEnabledComponent isEnabled={featureFlagDetails.surcharge}>
+                        <AccessControl isEnabled={featureFlagDetails.surcharge}>
                           <Surcharge />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"account-settings"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.sampleData>
+                        <AccessControl isEnabled=featureFlagDetails.sampleData>
                           <HSwitchSettings />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"account-settings", "profile"} => <HSwitchProfileSettings />
                       | list{"business-details"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.default>
+                        <AccessControl isEnabled=featureFlagDetails.default>
                           <BusinessDetails />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"business-profiles"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.businessProfile>
+                        <AccessControl isEnabled=featureFlagDetails.businessProfile>
                           <BusinessProfile />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"quick-start"} => determineQuickStartPageState()
                       | list{"woocommerce"} => determineWooCommerce()
                       | list{"stripe-plus-paypal"} => determineStripePlusPayPal()
diff --git a/src/utils/AccessControl.res b/src/utils/AccessControl.res
new file mode 100644
index 000000000..93d9c0951
--- /dev/null
+++ b/src/utils/AccessControl.res
@@ -0,0 +1,11 @@
+@react.component
+let make = (~isEnabled, ~children) => {
+  let {setDashboardPageState} = React.useContext(GlobalProvider.defaultContext)
+
+  let updateRoute = () => {
+    setDashboardPageState(_ => #HOME)
+    RescriptReactRouter.replace("/home")
+    React.null
+  }
+  isEnabled ? children : updateRoute()
+}