diff --git a/ui/dev-dist/sw.js b/ui/dev-dist/sw.js
index 0bcdc756..4b15efd4 100644
--- a/ui/dev-dist/sw.js
+++ b/ui/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.1jmha53s5bo"
+    "revision": "0.fduoepfh2f"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/ui/src/components/layouts/AuthLayout/Simple.tsx b/ui/src/components/layouts/AuthLayout/Simple.tsx
index a0118724..e0d9288c 100644
--- a/ui/src/components/layouts/AuthLayout/Simple.tsx
+++ b/ui/src/components/layouts/AuthLayout/Simple.tsx
@@ -12,6 +12,7 @@ import appConfig from '@/configs/app.config'
 import dayjs from 'dayjs'
 import { components } from 'react-select'
 import { ROUTES_ENUM } from '@/routes/route.constant'
+import { hasSubdomain } from '@/utils/subdomain'
 
 interface SimpleProps extends CommonProps {
   content?: ReactNode
@@ -92,17 +93,19 @@ const Simple = ({ children, content, ...rest }: SimpleProps) => {
       <Container className="flex flex-col flex-auto items-center justify-center min-w-0 h-full">
         <Card className="min-w-[320px] md:min-w-[450px]" bodyClass="md:p-10">
           <div className="flex justify-between items-center mb-4">
-            <a
-              href={ROUTES_ENUM.public.home}
-              rel="noopener noreferrer"
-              className="text-gray-500 hover:text-gray-700"
-            >
-              <HiArrowLeft className="text-2xl" />
-            </a>
+            {!hasSubdomain() && (
+              <a
+                href={ROUTES_ENUM.public.home}
+                rel="noopener noreferrer"
+                className="text-gray-500 hover:text-gray-700"
+              >
+                <HiArrowLeft className="text-2xl" />
+              </a>
+            )}
 
             <div className="w-12">
               <Select
-                className='cursor-pointer'
+                className="cursor-pointer"
                 options={languageOptions}
                 components={{
                   Option: CustomSelectOption,
diff --git a/ui/src/routes/dynamicRouter.tsx b/ui/src/routes/dynamicRouter.tsx
index 176f1fdd..5a761a98 100644
--- a/ui/src/routes/dynamicRouter.tsx
+++ b/ui/src/routes/dynamicRouter.tsx
@@ -44,7 +44,9 @@ export const DynamicRouter: React.FC = () => {
       </Route>
 
       {dynamicRoutes
-        .filter((r) => r.routeType !== 'protected')
+        .filter((r) =>
+          hasSubdomain() ? r.routeType === 'authenticated' : r.routeType !== 'protected',
+        )
         .map((route) => {
           const Component = route.getComponent()
           return (
@@ -70,8 +72,12 @@ export const DynamicRouter: React.FC = () => {
         }
       />
 
-      {/* Not Found */}
-      <Route path="*" element={<NotFound />} />
+      <Route
+        path="*"
+        element={
+          hasSubdomain() ? <Navigate to={ROUTES_ENUM.authenticated.login} replace /> : <NotFound />
+        }
+      />
     </Routes>
   )
 }