diff --git a/client/package.json b/client/package.json
index 5b88a133..7ecaddd0 100644
--- a/client/package.json
+++ b/client/package.json
@@ -3,6 +3,13 @@
   "version": "1.0.0",
   "description": "",
   "type": "module",
+  "sideEffects": [
+    "cypress/**/*",
+    "*.cy.ts",
+    "*.cy.js",
+    "*.spec.ts",
+    "*.spec.js"
+  ],
   "scripts": {
     "prod": "NODE_ENV=production webpack server --open --config webpack.prod.mjs",
     "dev": "NODE_ENV=development webpack server --open --config webpack.dev.mjs",
diff --git a/client/src/App.tsx b/client/src/App.tsx
index 2872860c..e49f11b7 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,10 +1,6 @@
 import {Outlet} from 'react-router-dom';
 import {Global} from '@emotion/react';
-import {ReactQueryDevtools} from '@tanstack/react-query-devtools';
 
-import QueryClientBoundary from '@components/QueryClientBoundary/QueryClientBoundary';
-import ErrorCatcher from '@components/AppErrorBoundary/ErrorCatcher';
-import ToastContainer from '@components/Toast/ToastContainer';
 import AmplitudeInitializer from '@components/AmplitudeInitializer/AmplitudeInitializer';
 
 import {HDesignProvider} from '@HDesign/index';
@@ -19,16 +15,10 @@ const App: React.FC = () => {
     <HDesignProvider>
       <UnPredictableErrorBoundary>
         <Global styles={GlobalStyle} />
-        <ErrorCatcher>
-          <QueryClientBoundary>
-            <ReactQueryDevtools initialIsOpen={false} />
-            <NetworkStateCatcher />
-            <ToastContainer />
-            <AmplitudeInitializer>
-              <Outlet />
-            </AmplitudeInitializer>
-          </QueryClientBoundary>
-        </ErrorCatcher>
+        <NetworkStateCatcher />
+        <AmplitudeInitializer>
+          <Outlet />
+        </AmplitudeInitializer>
       </UnPredictableErrorBoundary>
     </HDesignProvider>
   );
diff --git a/client/src/EssentialQueryApp.tsx b/client/src/EssentialQueryApp.tsx
new file mode 100644
index 00000000..5a2d1011
--- /dev/null
+++ b/client/src/EssentialQueryApp.tsx
@@ -0,0 +1,20 @@
+import {Outlet} from 'react-router-dom';
+import {ReactQueryDevtools} from '@tanstack/react-query-devtools';
+
+import QueryClientBoundary from '@components/QueryClientBoundary/QueryClientBoundary';
+import ErrorCatcher from '@components/AppErrorBoundary/ErrorCatcher';
+import ToastContainer from '@components/Toast/ToastContainer';
+
+const EssentialQueryApp: React.FC = () => {
+  return (
+    <ErrorCatcher>
+      <QueryClientBoundary>
+        <ReactQueryDevtools initialIsOpen={false} />
+        <ToastContainer />
+        <Outlet />
+      </QueryClientBoundary>
+    </ErrorCatcher>
+  );
+};
+
+export default EssentialQueryApp;
diff --git a/client/src/router.tsx b/client/src/router.tsx
index aae7b0f6..e1e34bb0 100644
--- a/client/src/router.tsx
+++ b/client/src/router.tsx
@@ -1,19 +1,17 @@
 import {createBrowserRouter} from 'react-router-dom';
 import {lazy, Suspense} from 'react';
 
-import ErrorPage from '@pages/ErrorPage/ErrorPage';
-import EventLoginPage from '@pages/EventPage/AdminPage/EventLoginPage';
-import EventLoader from '@components/Loader/EventLoader';
-import SendErrorPage from '@pages/ErrorPage/SendErrorPage';
-import AuthGate from '@pages/EventPage/AuthGate';
-
-import {EventPage} from '@pages/EventPage';
-import SendPage from '@pages/SendPage';
-
 import {ROUTER_URLS} from '@constants/routerUrls';
 
 import App from './App';
 
+const ErrorPage = lazy(() => import('@pages/ErrorPage/ErrorPage'));
+const SendErrorPage = lazy(() => import('@pages/ErrorPage/SendErrorPage'));
+const EventLoginPage = lazy(() => import('@pages/EventPage/AdminPage/EventLoginPage'));
+const EventLoader = lazy(() => import('@components/Loader/EventLoader'));
+const AuthGate = lazy(() => import('@pages/EventPage/AuthGate'));
+const EventPage = lazy(() => import('@pages/EventPage/EventPageLayout'));
+const SendPage = lazy(() => import('@pages/SendPage'));
 const MainPage = lazy(() => import('@pages/MainPage/MainPage'));
 const HomePage = lazy(() => import('@pages/EventPage/HomePage/HomePage'));
 const CreateEventFunnel = lazy(() => import('@pages/CreateEventPage/CreateEventFunnel'));
@@ -24,6 +22,7 @@ const EditBillPage = lazy(() => import('@pages/EditBillPage/EditBillPage'));
 const Account = lazy(() => import('@pages/AccountPage/Account'));
 const ImagesPage = lazy(() => import('@pages/ImagesPage/ImagesPage'));
 const AddImagesPage = lazy(() => import('@pages/AddImagesPage/AddImagesPage'));
+const EssentialQueryApp = lazy(() => import('./EssentialQueryApp'));
 const QRCodePage = lazy(() => import('@pages/QRCodePage/QRCodePage'));
 
 const router = createBrowserRouter([
@@ -41,62 +40,69 @@ const router = createBrowserRouter([
         element: <MainPage />,
       },
       {
-        path: ROUTER_URLS.createEvent,
-
-        element: <CreateEventFunnel />,
-      },
-      {
-        path: ROUTER_URLS.event,
-        element: (
-          <EventLoader>
-            <EventPage />
-          </EventLoader>
-        ),
+        element: <EssentialQueryApp />,
         children: [
           {
-            path: ROUTER_URLS.eventManage,
+            path: ROUTER_URLS.createEvent,
+            element: <CreateEventFunnel />,
+          },
+          {
+            path: ROUTER_URLS.event,
             element: (
-              <AuthGate fallback={<EventLoginPage />}>
-                <AdminPage />
-              </AuthGate>
+              <EventLoader>
+                <EventPage />
+              </EventLoader>
             ),
+            children: [
+              {
+                path: ROUTER_URLS.eventManage,
+                element: (
+                  <AuthGate fallback={<EventLoginPage />}>
+                    <AdminPage />
+                  </AuthGate>
+                ),
+              },
+              {
+                path: ROUTER_URLS.home,
+                element: <HomePage />,
+              },
+            ],
+          },
+          {
+            path: ROUTER_URLS.addBill,
+            element: <AddBillFunnel />,
+          },
+          {
+            path: ROUTER_URLS.member,
+            element: <EventMember />,
+          },
+          {
+            path: ROUTER_URLS.editBill,
+            element: <EditBillPage />,
+          },
+          {
+            path: ROUTER_URLS.eventEdit,
+            element: <Account />,
+          },
+          {
+            path: ROUTER_URLS.images,
+            element: <ImagesPage />,
+          },
+          {
+            path: ROUTER_URLS.addImages,
+            element: <AddImagesPage />,
+          },
+          {
+            path: ROUTER_URLS.send,
+            element: <SendPage />,
+            errorElement: <SendErrorPage />,
+          },
+          {
+            path: ROUTER_URLS.qrCode,
+            element: <QRCodePage />,
           },
-          {path: ROUTER_URLS.home, element: <HomePage />},
         ],
       },
-      {
-        path: ROUTER_URLS.addBill,
-        element: <AddBillFunnel />,
-      },
-      {
-        path: ROUTER_URLS.member,
-        element: <EventMember />,
-      },
-      {
-        path: ROUTER_URLS.editBill,
-        element: <EditBillPage />,
-      },
-      {
-        path: ROUTER_URLS.eventEdit,
-        element: <Account />,
-      },
-      {
-        path: ROUTER_URLS.images,
-        element: <ImagesPage />,
-      },
-      {
-        path: ROUTER_URLS.addImages,
-        element: <AddImagesPage />,
-      },
-      {
-        path: ROUTER_URLS.send,
-        element: <SendPage />,
-        errorElement: <SendErrorPage />,
-      },
-      {
-        path: ROUTER_URLS.qrCode,
-        element: <QRCodePage />,
-      },
       {
         path: '*',
         element: <ErrorPage />,
diff --git a/client/webpack.prod.mjs b/client/webpack.prod.mjs
index 1cf3bc7d..e542fba6 100644
--- a/client/webpack.prod.mjs
+++ b/client/webpack.prod.mjs
@@ -26,6 +26,9 @@ export default merge(common, {
       authToken: process.env.SENTRY_AUTH_TOKEN,
       org: 'wtc-o6',
       project: 'javascript-react',
+      sourcemaps: {
+        filesToDeleteAfterUpload: ['**/*.js.map', '**/*.css.map', '**/*.LICENSE.txt'],
+      },
     }),
   ],
 });