diff --git a/golden-crust-bakery/src/pages/Checkout.jsx b/golden-crust-bakery/src/pages/Checkout.jsx
index 5bb093ad0c05b63eb34b5ea63dc7ea1e299a82e4..8bcd5955917e8d3f3c2d92e9b3f58d6616863d67 100644
--- a/golden-crust-bakery/src/pages/Checkout.jsx
+++ b/golden-crust-bakery/src/pages/Checkout.jsx
@@ -53,14 +53,16 @@ export default function Checkout() {
         email: user.email || '',
       }));
     }
+  }, [initializeCart, isAuthenticated, user, navigate]);
 
-    if (cart.length === 0) {
+  useEffect(() => {
+    if (isAuthenticated && cart.length === 0) {
       toast.error('Cart is empty!', {
         description: 'Please add items to your cart before checking out.',
       });
       navigate('/menu');
     }
-  }, [cart.length, initializeCart, isAuthenticated, user, navigate]);
+  }, [cart.length, isAuthenticated, navigate]);
 
   // If not authenticated, don't render the checkout content
   if (!isAuthenticated) {
@@ -147,7 +149,9 @@ export default function Checkout() {
       setIsSubmitting(false);
       navigate(`/confirmation?orderId=${orderId}`);
 
-      clearCart();
+      setTimeout(() => {
+        clearCart();
+      }, 500);
     }, 1500);
   };