diff --git a/packages/features/medusa-storefront/src/lib/data/customer.ts b/packages/features/medusa-storefront/src/lib/data/customer.ts
index a33a33a..3c05921 100644
--- a/packages/features/medusa-storefront/src/lib/data/customer.ts
+++ b/packages/features/medusa-storefront/src/lib/data/customer.ts
@@ -126,18 +126,22 @@ export async function login(_currentState: unknown, formData: FormData) {
   }
 }
 
-export async function medusaLogout(countryCode = 'ee') {
+export async function medusaLogout(countryCode = 'ee', canRevalidateTags = true) {
   await sdk.auth.logout()
 
   await removeAuthToken()
 
-  const customerCacheTag = await getCacheTag("customers")
-  revalidateTag(customerCacheTag)
+  if (canRevalidateTags) {
+    const customerCacheTag = await getCacheTag("customers")
+    revalidateTag(customerCacheTag)
+  }
 
   await removeCartId()
 
-  const cartCacheTag = await getCacheTag("carts")
-  revalidateTag(cartCacheTag)
+  if (canRevalidateTags) {
+    const cartCacheTag = await getCacheTag("carts")
+    revalidateTag(cartCacheTag)
+  }
 }
 
 export async function transferCart() {
diff --git a/packages/supabase/src/hooks/use-sign-out.ts b/packages/supabase/src/hooks/use-sign-out.ts
index c354cee..7a64bd3 100644
--- a/packages/supabase/src/hooks/use-sign-out.ts
+++ b/packages/supabase/src/hooks/use-sign-out.ts
@@ -10,7 +10,7 @@ export function useSignOut() {
       try {
         try {
           const { medusaLogout } = await import('../../../features/medusa-storefront/src/lib/data/customer');
-          await medusaLogout();
+          await medusaLogout(undefined, false);
         } catch (medusaError) {
           console.warn('Medusa logout failed or not available:', medusaError);
         }