diff --git a/shop/components/NavbarClient.tsx b/shop/components/NavbarClient.tsx
index 83f052c..4c4d476 100644
--- a/shop/components/NavbarClient.tsx
+++ b/shop/components/NavbarClient.tsx
@@ -28,6 +28,11 @@ export function NavbarClient({ user, role = "partner" }: NavbarClientProps) {
     setPathname(window.location.pathname);
   }, []);
 
+  useEffect(() => {
+    setCurrentUser(user);
+    setUserRole(role);
+  }, [user, role]);
+
   // Supabase URL & Anon Key auslesen (für Browser-Client)
   const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL;
   const supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
@@ -78,7 +83,11 @@ export function NavbarClient({ user, role = "partner" }: NavbarClientProps) {
     } catch (e) {
       console.error("Fehler beim Server-Signout:", e);
     }
-    await supabase.auth.signOut();
+    try {
+      await supabase.auth.signOut();
+    } catch (e) {
+      console.error("Fehler beim Client-Signout:", e);
+    }
     setCurrentUser(null);
     setIsMobileMenuOpen(false);
     router.push("/");
diff --git a/shop/components/admin/logout-menu-item.tsx b/shop/components/admin/logout-menu-item.tsx
index dbffe2e..c0685db 100644
--- a/shop/components/admin/logout-menu-item.tsx
+++ b/shop/components/admin/logout-menu-item.tsx
@@ -30,7 +30,11 @@ export function AdminLogoutButton() {
     } catch (error) {
       console.error("Fehler beim Abmelden:", error);
     }
-    await supabase.auth.signOut();
+    try {
+      await supabase.auth.signOut();
+    } catch (e) {
+      console.error("Fehler beim Client-Signout:", e);
+    }
     router.push("/");
     router.refresh();
   };