diff --git a/app/client/src/AppRouter.tsx b/app/client/src/AppRouter.tsx
index 5f29241206..5935fd573d 100644
--- a/app/client/src/AppRouter.tsx
+++ b/app/client/src/AppRouter.tsx
@@ -130,10 +130,14 @@ function AppRouter(props: {
               <Redirect
                 exact
                 from={ADMIN_SETTINGS_PATH}
-                to={getDefaultAdminSettingsPath({
-                  isSuperUser: user?.isSuperUser || false,
-                  tenantPermissions,
-                })}
+                to={
+                  !user
+                    ? ADMIN_SETTINGS_PATH
+                    : getDefaultAdminSettingsPath({
+                        isSuperUser: user?.isSuperUser || false,
+                        tenantPermissions,
+                      })
+                }
               />
               <SentryRoute
                 component={Settings}
diff --git a/app/client/src/pages/Settings/WithSuperUserHoc.tsx b/app/client/src/ce/pages/AdminSettings/WithSuperUserHoc.tsx
similarity index 100%
rename from app/client/src/pages/Settings/WithSuperUserHoc.tsx
rename to app/client/src/ce/pages/AdminSettings/WithSuperUserHoc.tsx
diff --git a/app/client/src/ce/pages/AdminSettings/index.tsx b/app/client/src/ce/pages/AdminSettings/index.tsx
index 5ba11b847a..3b4749946a 100644
--- a/app/client/src/ce/pages/AdminSettings/index.tsx
+++ b/app/client/src/ce/pages/AdminSettings/index.tsx
@@ -7,7 +7,7 @@ import { getSettingsLoadingState } from "selectors/settingsSelectors";
 import styled from "styled-components";
 import LeftPane from "@appsmith/pages/AdminSettings/LeftPane";
 import Main from "@appsmith/pages/AdminSettings/Main";
-import WithSuperUserHOC from "pages/Settings/WithSuperUserHoc";
+import WithSuperUserHOC from "@appsmith/pages/AdminSettings/WithSuperUserHoc";
 import { getCurrentUser } from "selectors/usersSelectors";
 import bootIntercom from "utils/bootIntercom";
 import { LoaderContainer } from "pages/Settings/components";
diff --git a/app/client/src/ee/pages/AdminSettings/WithSuperUserHoc.tsx b/app/client/src/ee/pages/AdminSettings/WithSuperUserHoc.tsx
new file mode 100644
index 0000000000..59f7c45ab4
--- /dev/null
+++ b/app/client/src/ee/pages/AdminSettings/WithSuperUserHoc.tsx
@@ -0,0 +1,3 @@
+export * from "ce/pages/AdminSettings/WithSuperUserHoc";
+import { default as CE_WithSuperUserHOC } from "ce/pages/AdminSettings/WithSuperUserHoc";
+export default CE_WithSuperUserHOC;