diff --git a/rsconcept/frontend/src/app/ApplicationLayout.tsx b/rsconcept/frontend/src/app/ApplicationLayout.tsx
index 0229394f..87407967 100644
--- a/rsconcept/frontend/src/app/ApplicationLayout.tsx
+++ b/rsconcept/frontend/src/app/ApplicationLayout.tsx
@@ -1,5 +1,4 @@
 import { Suspense } from 'react';
-import { ErrorBoundary } from 'react-error-boundary';
 import { Outlet } from 'react-router';
 
 import ConceptToaster from '@/app/ConceptToaster';
@@ -10,22 +9,10 @@ import ModalLoader from '@/components/ui/ModalLoader';
 import { useAppLayoutStore, useMainHeight, useViewportHeight } from '@/stores/appLayout';
 import { globals } from '@/utils/constants';
 
-import ErrorFallback from './ErrorFallback';
 import { GlobalDialogs } from './GlobalDialogs';
 import { GlobalTooltips } from './GlobalTooltips';
 import { NavigationState } from './Navigation/NavigationContext';
 
-const resetState = () => {
-  console.log('Resetting state after error fallback');
-};
-
-const logError = (error: Error, info: { componentStack?: string | null | undefined }) => {
-  console.log('Error fallback: ' + error.message);
-  if (info.componentStack) {
-    console.log('Component stack: ' + info.componentStack);
-  }
-};
-
 function ApplicationLayout() {
   const mainHeight = useMainHeight();
   const viewportHeight = useViewportHeight();
@@ -35,41 +22,39 @@ function ApplicationLayout() {
   const noFooter = useAppLayoutStore(state => state.noFooter);
 
   return (
-    <ErrorBoundary FallbackComponent={ErrorFallback} onError={logError} onReset={resetState}>
-      <NavigationState>
-        <div className='min-w-[20rem] antialiased h-full max-w-[120rem] mx-auto'>
-          <ConceptToaster
-            className='text-[14px] cc-animate-position'
-            style={{ marginTop: noNavigationAnimation ? '1.5rem' : '3.5rem' }}
-            autoClose={3000}
-            draggable={false}
-            pauseOnFocusLoss={false}
-          />
+    <NavigationState>
+      <div className='min-w-[20rem] antialiased h-full max-w-[120rem] mx-auto'>
+        <ConceptToaster
+          className='text-[14px] cc-animate-position'
+          style={{ marginTop: noNavigationAnimation ? '1.5rem' : '3.5rem' }}
+          autoClose={3000}
+          draggable={false}
+          pauseOnFocusLoss={false}
+        />
 
-          <Suspense fallback={<ModalLoader />}>
-            <GlobalDialogs />
-          </Suspense>
-          <GlobalTooltips />
+        <Suspense fallback={<ModalLoader />}>
+          <GlobalDialogs />
+        </Suspense>
+        <GlobalTooltips />
 
-          <Navigation />
+        <Navigation />
 
-          <div
-            id={globals.main_scroll}
-            className='overflow-x-auto max-w-[100vw]'
-            style={{
-              maxHeight: viewportHeight
-            }}
-          >
-            <main className='cc-scroll-y' style={{ overflowY: showScroll ? 'scroll' : 'auto', minHeight: mainHeight }}>
-              <Suspense fallback={<Loader />}>
-                <Outlet />
-              </Suspense>
-            </main>
-            {!noNavigation && !noFooter ? <Footer /> : null}
-          </div>
+        <div
+          id={globals.main_scroll}
+          className='overflow-x-auto max-w-[100vw]'
+          style={{
+            maxHeight: viewportHeight
+          }}
+        >
+          <main className='cc-scroll-y' style={{ overflowY: showScroll ? 'scroll' : 'auto', minHeight: mainHeight }}>
+            <Suspense fallback={<Loader />}>
+              <Outlet />
+            </Suspense>
+          </main>
+          {!noNavigation && !noFooter ? <Footer /> : null}
         </div>
-      </NavigationState>
-    </ErrorBoundary>
+      </div>
+    </NavigationState>
   );
 }
 
diff --git a/rsconcept/frontend/src/app/ErrorFallback.tsx b/rsconcept/frontend/src/app/ErrorFallback.tsx
index 843d0df8..c83c5162 100644
--- a/rsconcept/frontend/src/app/ErrorFallback.tsx
+++ b/rsconcept/frontend/src/app/ErrorFallback.tsx
@@ -1,13 +1,19 @@
-import { type FallbackProps } from 'react-error-boundary';
+import { useNavigate, useRouteError } from 'react-router';
 
 import InfoError from '@/components/info/InfoError';
 import Button from '@/components/ui/Button';
 
-function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
+function ErrorFallback() {
+  const error = useRouteError();
+  const router = useNavigate();
+
+  function resetErrorBoundary() {
+    Promise.resolve(router('/')).catch(console.log);
+  }
   return (
     <div className='flex flex-col gap-3 my-3 items-center antialiased' role='alert'>
       <h1 className='my-2'>Что-то пошло не так!</h1>
-      <Button onClick={resetErrorBoundary} text='Попробовать еще раз' />
+      <Button onClick={resetErrorBoundary} text='Вернуться на главную' />
       <InfoError error={error as Error} />
     </div>
   );
diff --git a/rsconcept/frontend/src/app/Router.tsx b/rsconcept/frontend/src/app/Router.tsx
index 28c8bff2..c74ab5b3 100644
--- a/rsconcept/frontend/src/app/Router.tsx
+++ b/rsconcept/frontend/src/app/Router.tsx
@@ -13,13 +13,14 @@ import LoginPage from '@/pages/LoginPage';
 import NotFoundPage from '@/pages/NotFoundPage';
 
 import ApplicationLayout from './ApplicationLayout';
+import ErrorFallback from './ErrorFallback';
 import { routes } from './urls';
 
 export const Router = createBrowserRouter([
   {
     path: '/',
     element: <ApplicationLayout />,
-    errorElement: <NotFoundPage />,
+    errorElement: <ErrorFallback />,
     loader: prefetchAuth,
     hydrateFallbackElement: <Loader />,
     children: [