diff --git a/customer-spa/src/layouts/BaseLayout.tsx b/customer-spa/src/layouts/BaseLayout.tsx
index 258d99d..c74d6c0 100644
--- a/customer-spa/src/layouts/BaseLayout.tsx
+++ b/customer-spa/src/layouts/BaseLayout.tsx
@@ -134,8 +134,8 @@ function ClassicLayout({ children }: BaseLayoutProps) {
                   </Link>
                 ))}
 
-                {/* Wishlist */}
-                {headerSettings.elements.wishlist && isEnabled('wishlist') && (wishlistSettings.show_in_header ?? true) && (
+                {/* Wishlist - Only for guests (logged-in users use /my-account/wishlist) */}
+                {headerSettings.elements.wishlist && isEnabled('wishlist') && (wishlistSettings.show_in_header ?? true) && !user?.isLoggedIn && (
                   <Link to="/wishlist" className="flex items-center gap-2 text-sm font-medium text-gray-700 hover:text-gray-900 transition-colors no-underline">
                     <Heart className="h-5 w-5" />
                     <span className="hidden lg:block">Wishlist</span>
@@ -428,7 +428,8 @@ function ModernLayout({ children }: BaseLayoutProps) {
                     </Link>
                   )
                 )}
-                {headerSettings.elements.wishlist && isEnabled('wishlist') && (wishlistSettings.show_in_header ?? true) && (
+                {/* Wishlist - Only for guests */}
+                {headerSettings.elements.wishlist && isEnabled('wishlist') && (wishlistSettings.show_in_header ?? true) && !user?.isLoggedIn && (
                   <Link to="/wishlist" className="flex items-center gap-1 text-sm font-medium text-gray-700 hover:text-gray-900 transition-colors no-underline">
                     <Heart className="h-4 w-4" /> Wishlist
                   </Link>
@@ -561,7 +562,8 @@ function BoutiqueLayout({ children }: BaseLayoutProps) {
                       <User className="h-4 w-4" /> Account
                     </Link>
                   ))}
-                  {headerSettings.elements.wishlist && isEnabled('wishlist') && (wishlistSettings.show_in_header ?? true) && (
+                  {/* Wishlist - Only for guests */}
+                  {headerSettings.elements.wishlist && isEnabled('wishlist') && (wishlistSettings.show_in_header ?? true) && !user?.isLoggedIn && (
                     <Link to="/wishlist" className="flex items-center gap-1 text-sm uppercase tracking-wider text-gray-700 hover:text-gray-900 transition-colors no-underline">
                       <Heart className="h-4 w-4" /> Wishlist
                     </Link>