diff --git a/apps/admin.saladeaula.digital/app/middleware/workspace.ts b/apps/admin.saladeaula.digital/app/middleware/workspace.ts
index ea1033e..491510f 100644
--- a/apps/admin.saladeaula.digital/app/middleware/workspace.ts
+++ b/apps/admin.saladeaula.digital/app/middleware/workspace.ts
@@ -41,6 +41,7 @@ export const workspaceMiddleware = async (
   { params, request, context }: LoaderFunctionArgs,
   next: () => Promise<Response>
 ): Promise<Response> => {
+  const url = new URL(request.url)
   const user = context.get(userContext)!
 
   const r = await req({
@@ -66,7 +67,11 @@ export const workspaceMiddleware = async (
       ? (workspaces.find(({ id }) => id === preferred_org_id) ?? workspaces[0])
       : workspaces[0]
 
-    throw redirect(`/${fallback.id}/main`)
+    if (!fallback) {
+      throw new Response(null, { status: 403 })
+    }
+
+    throw redirect(`/${fallback.id}${url.pathname}`)
   }
 
   const org = (await req({
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
index 25d8b08..d4550ec 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
@@ -72,7 +72,7 @@ export default function Route({ loaderData }: Route.ComponentProps) {
   }, [])
 
   return (
-    <WorkspaceProvider {...props}>
+    <>
       {blocked ? (
         <AlertDialog open={true}>
           <AlertDialogContent>
@@ -85,45 +85,47 @@ export default function Route({ loaderData }: Route.ComponentProps) {
         </AlertDialog>
       ) : null}
 
-      <SidebarProvider
-        defaultOpen={sidebar_state === 'true'}
-        className={cn('flex', blocked && 'pointer-events-none')}
-      >
-        <AppSidebar />
+      <WorkspaceProvider {...props}>
+        <SidebarProvider
+          defaultOpen={sidebar_state === 'true'}
+          className={cn('flex', blocked && 'pointer-events-none')}
+        >
+          <AppSidebar />
 
-        <SidebarInset className="relative flex flex-col flex-1 min-w-0">
-          <header
-            className="bg-background/15 backdrop-blur-sm
+          <SidebarInset className="relative flex flex-col flex-1 min-w-0">
+            <header
+              className="bg-background/15 backdrop-blur-sm
                        px-4 py-2 lg:py-4 sticky top-0 z-10"
-          >
-            <div className="container mx-auto flex items-center max-w-7xl">
-              <SidebarTrigger className="md:hidden" />
-              <ThemedImage className="max-md:hidden" />
+            >
+              <div className="container mx-auto flex items-center max-w-7xl">
+                <SidebarTrigger className="md:hidden" />
+                <ThemedImage className="max-md:hidden" />
 
-              <div className="ml-auto flex gap-2.5 items-center">
-                <TestMode />
-                {/*<Notification />*/}
-                <ModeToggle />
-                <NavUser user={user} excludeApps={['admin']} />
+                <div className="ml-auto flex gap-2.5 items-center">
+                  <TestMode />
+                  {/*<Notification />*/}
+                  <ModeToggle />
+                  <NavUser user={user} excludeApps={['admin']} />
+                </div>
+              </div>
+            </header>
+
+            <div className="p-4">
+              <div className="container mx-auto relative max-w-7xl">
+                <Outlet />
+
+                <Toaster
+                  position="top-center"
+                  richColors={true}
+                  duration={Infinity}
+                  closeButton={true}
+                />
               </div>
             </div>
-          </header>
-
-          <div className="p-4">
-            <div className="container mx-auto relative max-w-7xl">
-              <Outlet />
-
-              <Toaster
-                position="top-center"
-                richColors={true}
-                duration={Infinity}
-                closeButton={true}
-              />
-            </div>
-          </div>
-        </SidebarInset>
-      </SidebarProvider>
-    </WorkspaceProvider>
+          </SidebarInset>
+        </SidebarProvider>
+      </WorkspaceProvider>
+    </>
   )
 }