diff --git a/apps/admin.saladeaula.digital/app/components/workspace-switcher.tsx b/apps/admin.saladeaula.digital/app/components/workspace-switcher.tsx
index e13d35b..aa80352 100644
--- a/apps/admin.saladeaula.digital/app/components/workspace-switcher.tsx
+++ b/apps/admin.saladeaula.digital/app/components/workspace-switcher.tsx
@@ -5,7 +5,6 @@ import {
   BadgeCheckIcon,
   CheckIcon,
   ChevronsUpDownIcon,
-  FlaskConicalIcon,
   PlusIcon
 } from 'lucide-react'
 import { createContext, use } from 'react'
@@ -55,8 +54,7 @@ export function WorkspaceProvider({
 export function WorkspaceSwitcher() {
   const location = useLocation()
   const { isMobile, state } = useSidebar()
-  const { activeWorkspace, workspaces, subscription, test_mode } =
-    useWorksapce()
+  const { activeWorkspace, workspaces, subscription } = useWorksapce()
   const [, fragment, _] = location.pathname.slice(1).split('/')
 
   const onSelect = (workspace: Workspace) => {
@@ -76,14 +74,10 @@ export function WorkspaceSwitcher() {
                 className="aria-expanded:border flex aspect-square size-8 items-center justify-center rounded-lg relative"
                 aria-expanded={state === 'expanded'}
               >
-                {subscription && !test_mode ? (
+                {subscription ? (
                   <BadgeCheckIcon className="fill-blue-500 stroke-white absolute size-4 dark:size-3.5 -top-1.5 -right-1.5" />
                 ) : null}
 
-                {test_mode ? (
-                  <FlaskConicalIcon className="absolute size-3.5 -top-1.5 -right-1.5" />
-                ) : null}
-
                 {initials(activeWorkspace.name)}
               </div>
               <div className="grid flex-1 text-left text-sm leading-tight">
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
index eaa68b1..25d8b08 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
@@ -1,6 +1,7 @@
 import type { Route } from './+types/route'
 
 import * as cookie from 'cookie'
+import { FlaskConicalIcon } from 'lucide-react'
 import { useEffect } from 'react'
 import { Outlet, type ShouldRevalidateFunctionArgs } from 'react-router'
 
@@ -23,7 +24,10 @@ import { Toaster } from '@repo/ui/components/ui/sonner'
 import { cn } from '@repo/ui/lib/utils'
 
 import { AppSidebar } from '@/components/app-sidebar'
-import { WorkspaceProvider } from '@/components/workspace-switcher'
+import {
+  useWorksapce,
+  WorkspaceProvider
+} from '@/components/workspace-switcher'
 import { workspaceContext, workspaceMiddleware } from '@/middleware/workspace'
 
 // import { Notification } from '@/components/notification'
@@ -97,6 +101,7 @@ export default function Route({ loaderData }: Route.ComponentProps) {
               <ThemedImage className="max-md:hidden" />
 
               <div className="ml-auto flex gap-2.5 items-center">
+                <TestMode />
                 {/*<Notification />*/}
                 <ModeToggle />
                 <NavUser user={user} excludeApps={['admin']} />
@@ -121,3 +126,13 @@ export default function Route({ loaderData }: Route.ComponentProps) {
     </WorkspaceProvider>
   )
 }
+
+function TestMode() {
+  const { test_mode } = useWorksapce()
+
+  if (!test_mode) {
+    return null
+  }
+
+  return <FlaskConicalIcon className="size-3.5 text-muted-foreground" />
+}