diff --git a/app/client/src/ce/AppRouter.tsx b/app/client/src/ce/AppRouter.tsx
index cbfd14f1ef..1d95ef88c6 100644
--- a/app/client/src/ce/AppRouter.tsx
+++ b/app/client/src/ce/AppRouter.tsx
@@ -45,7 +45,10 @@ import * as Sentry from "@sentry/react";
 import { getSafeCrash, getSafeCrashCode } from "selectors/errorSelectors";
 import UserProfile from "pages/UserProfile";
 import { getCurrentUser } from "actions/authActions";
-import { getCurrentUserLoading } from "selectors/usersSelectors";
+import {
+  getCurrentUserLoading,
+  getFeatureFlagsFetching,
+} from "selectors/usersSelectors";
 import Setup from "pages/setup";
 import SettingsLoader from "pages/AdminSettings/loader";
 import SignupSuccess from "pages/setup/SignupSuccess";
@@ -153,6 +156,7 @@ function AppRouter(props: {
   } = props;
   const tenantIsLoading = useSelector(isTenantLoading);
   const currentUserIsLoading = useSelector(getCurrentUserLoading);
+  const featuresIsLoading = useSelector(getFeatureFlagsFetching);
 
   useEffect(() => {
     getCurrentUser();
@@ -166,7 +170,11 @@ function AppRouter(props: {
 
   // hide the top loader once the tenant is loaded
   useEffect(() => {
-    if (tenantIsLoading === false && currentUserIsLoading === false) {
+    if (
+      tenantIsLoading === false &&
+      currentUserIsLoading === false &&
+      featuresIsLoading === false
+    ) {
       const loader = document.getElementById("loader") as HTMLDivElement;
 
       if (loader) {
@@ -177,9 +185,9 @@ function AppRouter(props: {
         });
       }
     }
-  }, [tenantIsLoading, currentUserIsLoading]);
+  }, [tenantIsLoading, currentUserIsLoading, featuresIsLoading]);
 
-  if (tenantIsLoading || currentUserIsLoading) return null;
+  if (tenantIsLoading || currentUserIsLoading || featuresIsLoading) return null;
 
   return (
     <Router history={history}>
diff --git a/app/client/src/reducers/uiReducers/usersReducer.ts b/app/client/src/reducers/uiReducers/usersReducer.ts
index cfef428966..52c0b5f96c 100644
--- a/app/client/src/reducers/uiReducers/usersReducer.ts
+++ b/app/client/src/reducers/uiReducers/usersReducer.ts
@@ -24,6 +24,7 @@ const initialState: UsersReduxState = {
   featureFlag: {
     data: DEFAULT_FEATURE_FLAG_VALUE,
     isFetched: false,
+    isFetching: true,
   },
   productAlert: {
     config: {
@@ -173,6 +174,14 @@ const usersReducer = createReducer(initialState, {
       photoId: action.payload.photoId,
     },
   }),
+  [ReduxActionTypes.FETCH_FEATURE_FLAGS_INIT]: (state: UsersReduxState) => ({
+    ...state,
+    featureFlag: {
+      ...state.featureFlag,
+      isFetched: false,
+      isFetching: true,
+    },
+  }),
   [ReduxActionTypes.FETCH_FEATURE_FLAGS_SUCCESS]: (
     state: UsersReduxState,
     action: ReduxAction<FeatureFlags>,
@@ -181,6 +190,7 @@ const usersReducer = createReducer(initialState, {
     featureFlag: {
       data: action.payload,
       isFetched: true,
+      isFetching: false,
     },
   }),
   [ReduxActionErrorTypes.FETCH_FEATURE_FLAGS_ERROR]: (
@@ -190,6 +200,7 @@ const usersReducer = createReducer(initialState, {
     featureFlag: {
       data: {},
       isFetched: true,
+      isFetching: false,
     },
   }),
   [ReduxActionTypes.FETCH_PRODUCT_ALERT_SUCCESS]: (
@@ -252,6 +263,7 @@ export interface UsersReduxState {
   featureFlag: {
     isFetched: boolean;
     data: FeatureFlags;
+    isFetching: boolean;
   };
   productAlert: ProductAlertState;
 }
diff --git a/app/client/src/selectors/usersSelectors.tsx b/app/client/src/selectors/usersSelectors.tsx
index 53fcc78c02..e693ec0aa1 100644
--- a/app/client/src/selectors/usersSelectors.tsx
+++ b/app/client/src/selectors/usersSelectors.tsx
@@ -5,16 +5,24 @@ import { ANONYMOUS_USERNAME } from "constants/userConstants";
 
 export const getCurrentUser = (state: AppState): User | undefined =>
   state.ui?.users?.currentUser;
+
 export const getCurrentUserLoading = (state: AppState): boolean =>
   state.ui.users.loadingStates.fetchingUser;
+
 export const getUserAuthError = (state: AppState): string =>
   state.ui.users.error;
+
 export const getUsers = (state: AppState): User[] => state.ui.users.users;
+
 export const getProppanePreference = (
   state: AppState,
 ): PropertyPanePositionConfig | undefined => state.ui.users.propPanePreferences;
+
 export const getFeatureFlagsFetched = (state: AppState) =>
   state.ui.users.featureFlag.isFetched;
 
+export const getFeatureFlagsFetching = (state: AppState) =>
+  state.ui.users.featureFlag.isFetching;
+
 export const getIsUserLoggedIn = (state: AppState): boolean =>
   state.ui.users.currentUser?.email !== ANONYMOUS_USERNAME;