diff --git a/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/MaintenanceMode.jsx b/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/MaintenanceMode.jsx
index c2b969146f..8b1b1cece0 100644
--- a/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/MaintenanceMode.jsx
+++ b/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/MaintenanceMode.jsx
@@ -3,12 +3,14 @@ import useStore from '@/AppBuilder/_stores/store';
 import SwitchComponent from '@/components/ui/Switch/Index';
 import { shallow } from 'zustand/shallow';
 import { Confirm } from '@/Editor/Viewer/Confirm';
+import { useModuleContext } from '@/AppBuilder/_contexts/ModuleContext';
 
 const MaintenanceMode = ({ darkMode }) => {
+  const { moduleId } = useModuleContext();
   const [showConfirmation, setConfirmationShow] = useState(false);
   const { isMaintenanceOn, toggleAppMaintenance } = useStore(
     (state) => ({
-      isMaintenanceOn: state.app.isMaintenanceOn,
+      isMaintenanceOn: state.appStore.modules[moduleId].app.isMaintenanceOn,
       toggleAppMaintenance: state.toggleAppMaintenance,
     }),
     shallow
diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx
index 6a4a1c516a..92464e4573 100644
--- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx
+++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx
@@ -8,6 +8,7 @@ import { appPermissionService } from '@/_services';
 import { ConfirmDialog } from '@/_components';
 import toast from 'react-hot-toast';
 import Spinner from '@/_ui/Spinner';
+import { useModuleContext } from '@/AppBuilder/_contexts/ModuleContext';
 
 const PERMISSION_TYPES = {
   single: 'SINGLE',
@@ -16,10 +17,11 @@ const PERMISSION_TYPES = {
 };
 
 export default function PagePermission({ darkMode }) {
+  const { moduleId } = useModuleContext();
   const showPagePermissionModal = useStore((state) => state.showPagePermissionModal);
   const togglePagePermissionModal = useStore((state) => state.togglePagePermissionModal);
   const editingPage = useStore((state) => state.editingPage);
-  const appId = useStore((state) => state.app.appId);
+  const appId = useStore((state) => state.appStore.modules[moduleId].app.appId);
   const selectedUserGroups = useStore((state) => state.selectedUserGroups);
   const setSelectedUserGroups = useStore((state) => state.setSelectedUserGroups);
   const selectedUsers = useStore((state) => state.selectedUsers);
@@ -360,7 +362,8 @@ export default function PagePermission({ darkMode }) {
 }
 
 const UserGroupSelect = () => {
-  const appId = useStore((state) => state.app.appId);
+  const { moduleId } = useModuleContext();
+  const appId = useStore((state) => state.appStore.modules[moduleId].app.appId);
   const selectedUserGroups = useStore((state) => state.selectedUserGroups);
   const setSelectedUserGroups = useStore((state) => state.setSelectedUserGroups);
   const [userGroups, setUserGroups] = useState([]);
@@ -420,7 +423,8 @@ const UserGroupSelect = () => {
 };
 
 const UserSelect = () => {
-  const appId = useStore((state) => state.app.appId);
+  const { moduleId } = useModuleContext();
+  const appId = useStore((state) => state.appStore.modules[moduleId].app.appId);
   const editingPage = useStore((state) => state.editingPage);
   const selectedUsers = useStore((state) => state.selectedUsers);
   const setSelectedUsers = useStore((state) => state.setSelectedUsers);
diff --git a/frontend/src/AppBuilder/Viewer/Viewer.jsx b/frontend/src/AppBuilder/Viewer/Viewer.jsx
index 8931d8df1d..48bfc7e632 100644
--- a/frontend/src/AppBuilder/Viewer/Viewer.jsx
+++ b/frontend/src/AppBuilder/Viewer/Viewer.jsx
@@ -202,7 +202,7 @@ export const Viewer = ({
                       <div
                         className="canvas-container align-items-center"
                         style={{
-                          backgroundColor: canvasBgColor,
+                          backgroundColor: moduleMode ? 'inherit' : canvasBgColor,
                         }}
                       >
                         <div className={`areas d-flex flex-rows app-${appId}`}>
diff --git a/frontend/src/AppBuilder/_hooks/useAppData.js b/frontend/src/AppBuilder/_hooks/useAppData.js
index 9440efca40..18abcc63be 100644
--- a/frontend/src/AppBuilder/_hooks/useAppData.js
+++ b/frontend/src/AppBuilder/_hooks/useAppData.js
@@ -358,13 +358,13 @@ const useAppData = (
             global_settings.theme = baseTheme;
           }
           setGlobalSettings(global_settings);
-
-          setPages(pages, moduleId);
-          setPageSettings(
-            computePageSettings(deepCamelCase(appData?.editing_version?.page_settings ?? appData?.page_settings))
-          );
         }
 
+        setPages(pages, moduleId);
+        setPageSettings(
+          computePageSettings(deepCamelCase(appData?.editing_version?.page_settings ?? appData?.page_settings))
+        );
+
         // set starting page as homepage initially
         let startingPage = appData.pages.find((page) => page.id === homePageId);
 
@@ -513,10 +513,15 @@ const useAppData = (
         };
       })
       .catch((error) => {
+        console.log('error--- ', error);
+
         if (isPublicAccess) {
           if (mode !== 'edit') {
             handleError('view', error);
           }
+        } else if (moduleMode) {
+          setEditorLoading(false, moduleId);
+          toast.error('Error fetching module data');
         }
       });
   }, [setApp, setEditorLoading, currentSession]);
diff --git a/frontend/src/_helpers/routes.js b/frontend/src/_helpers/routes.js
index 0f552cb955..495ca04e18 100644
--- a/frontend/src/_helpers/routes.js
+++ b/frontend/src/_helpers/routes.js
@@ -21,6 +21,7 @@ export const getPrivateRoute = (page, params = {}) => {
     workflows: '/workflows',
     workspace_constants: '/workspace-constants',
     profile_settings: '/profile-settings',
+    modules: '/modules',
   };
 
   let url = routes[page];
diff --git a/server/ee b/server/ee
index e4bada4648..f779cb9954 160000
--- a/server/ee
+++ b/server/ee
@@ -1 +1 @@
-Subproject commit e4bada464821218151cfa0c6ed1c7b31e18fa2c4
+Subproject commit f779cb99549ae248dbca9e3d0f658359651ede75