diff --git a/01-frontend/src/helper/navbar/NavBar.tsx b/01-frontend/src/helper/navbar/NavBar.tsx
index 6af0025..0736a37 100644
--- a/01-frontend/src/helper/navbar/NavBar.tsx
+++ b/01-frontend/src/helper/navbar/NavBar.tsx
@@ -69,6 +69,12 @@ export default function NavBar() {
             setLoginOpen(true);
         } else if (link === 'logout') {
             logout();
+            if (
+                location.pathname.startsWith('/account') ||
+                location.pathname.startsWith('/orders')
+            ) {
+                navigate('/');
+            }
         } else {
             navigate(`/${link.toLowerCase()}`)
         }