diff --git a/pages/checkout.vue b/pages/checkout.vue
index b5487e23..e3dd2d45 100644
--- a/pages/checkout.vue
+++ b/pages/checkout.vue
@@ -6,6 +6,11 @@
 </template>
 
 <script setup>
+import { useCart } from "@/store/useCart";
+const cart = useCart();
+if (cart.cart.length === 0) {
+  await navigateTo("/");
+}
 useHead({
   title: "Checkout",
   titleTemplate: "%s - Nuxt 3 Woocommerce",
diff --git a/pages/product/[product].vue b/pages/product/[product].vue
index 49e20e53..8af5d9fb 100644
--- a/pages/product/[product].vue
+++ b/pages/product/[product].vue
@@ -9,7 +9,8 @@ const route = useRoute();
 
 const variables = { id: route.query.id };
 const { result } = await useAsyncQuery(GET_SINGLE_PRODUCT_QUERY, variables);
-const productData = result.value?.product;
+
+const productData = computed(() => result.value?.product);
 
 useHead({
   title: route.params.product,
diff --git a/store/useCart.js b/store/useCart.js
index 89b4782e..ef3e75b7 100644
--- a/store/useCart.js
+++ b/store/useCart.js
@@ -93,11 +93,14 @@ export const useCart = defineStore(
       loading.value = true;
       error.value = null;
       try {
+        const isLastItem = cart.value.length === 1;
         await updateCartItemQuantity(key, 0);
+        if (isLastItem) {
+          await navigateTo("/");
+        }
       } catch (err) {
       } finally {
         loading.value = false;
-        await refetchCart();
       }
     };