diff --git a/src/App.js b/src/App.js
index 826d9c21..97217534 100644
--- a/src/App.js
+++ b/src/App.js
@@ -9,9 +9,9 @@ import Router from './router';
 if (process.env.NODE_ENV === 'production') console.log = function () {};
 const App = props => (
   <>
-    <MessageModal />
+    {/* <MessageModal />
     <MessageErrorModal />
-    <MessageInfoModal />
+    <MessageInfoModal /> */}
     <Router />
   </>
 );
diff --git a/src/components/message/MessageModal.js b/src/components/message/MessageModal.js
index 17916f09..c10c8095 100644
--- a/src/components/message/MessageModal.js
+++ b/src/components/message/MessageModal.js
@@ -20,6 +20,7 @@ export const MessageModal = () => {
     dispatch(closeModal());
 
     if (isHistoryBack) {
+      console.log(history, '---');
       history.goBack();
     }
 
diff --git a/src/router/hoc/ResolveRoutes.tsx b/src/router/hoc/ResolveRoutes.tsx
index cf17eddf..4fc3a02a 100644
--- a/src/router/hoc/ResolveRoutes.tsx
+++ b/src/router/hoc/ResolveRoutes.tsx
@@ -11,6 +11,9 @@ import { IRoute } from '../routes/type';
 import { Routes } from '../routes';
 import authenticationCheck from './authenticationCheck';
 import { useSelector } from '@src/redux/store';
+import { MessageInfoModal } from '@src/components/message/MessageInfoModal';
+import { MessageErrorModal } from '@src/components/message/MessageErrorModal';
+import { MessageModal } from '@src/components/message/MessageModal';
 
 export default function ResolveRoutes() {
   const [layout, setLayout] = useLayout();
@@ -53,6 +56,9 @@ export default function ResolveRoutes() {
 
     return (
       <Route path={LayoutPaths} key={index}>
+        <MessageModal />
+        <MessageErrorModal />
+        <MessageInfoModal />
         <LayoutTag
           routerProps={routerProps}
           layout={layout}