diff --git a/components/cart/edit-item-quantity-button.tsx b/components/cart/edit-item-quantity-button.tsx
index d3c753dd7..7b0f90f45 100644
--- a/components/cart/edit-item-quantity-button.tsx
+++ b/components/cart/edit-item-quantity-button.tsx
@@ -47,7 +47,7 @@ export function EditItemQuantityButton({
   return (
     <form
       action={async () => {
-        optimisticUpdate({ itemId: payload.lineId, newQuantity: payload.quantity });
+        optimisticUpdate({ itemId: payload.lineId, newQuantity: payload.quantity, type });
         await actionWithVariant();
       }}
     >
diff --git a/components/cart/modal.tsx b/components/cart/modal.tsx
index a9ad109a1..52602c6a3 100644
--- a/components/cart/modal.tsx
+++ b/components/cart/modal.tsx
@@ -24,6 +24,7 @@ type MerchandiseSearchParams = {
 type NewState = {
   itemId: string;
   newQuantity: number;
+  type: 'plus' | 'minus';
 };
 
 function reducer(state: Cart | undefined, newState: NewState) {
@@ -31,24 +32,32 @@ function reducer(state: Cart | undefined, newState: NewState) {
     return state;
   }
 
-  const updatedLines = state.lines.map((item: CartItem) => {
-    if (item.id === newState.itemId) {
-      const singleItemAmount = Number(item.cost.totalAmount.amount) / item.quantity;
-      const newTotalAmount = Number(item.cost.totalAmount.amount) + singleItemAmount;
-      return {
-        ...item,
-        quantity: newState.newQuantity,
-        cost: {
-          ...item.cost,
-          totalAmount: {
-            ...item.cost.totalAmount,
-            amount: newTotalAmount.toString()
-          }
+  let updatedLines = state.lines
+    .map((item: CartItem) => {
+      if (item.id === newState.itemId) {
+        if (newState.type === 'minus' && newState.newQuantity === 0) {
+          // Remove the item if quantity becomes 0
+          return null;
         }
-      };
-    }
-    return item;
-  });
+
+        const singleItemAmount = Number(item.cost.totalAmount.amount) / item.quantity;
+        const newTotalAmount = singleItemAmount * newState.newQuantity;
+
+        return {
+          ...item,
+          quantity: newState.newQuantity,
+          cost: {
+            ...item.cost,
+            totalAmount: {
+              ...item.cost.totalAmount,
+              amount: newTotalAmount.toString()
+            }
+          }
+        };
+      }
+      return item;
+    })
+    .filter(Boolean) as CartItem[];
 
   const newTotalQuantity = updatedLines.reduce((sum, item) => sum + item.quantity, 0);
   const newTotalAmount = updatedLines.reduce(
@@ -56,6 +65,22 @@ function reducer(state: Cart | undefined, newState: NewState) {
     0
   );
 
+  // If there are no items left, return an empty cart
+  if (updatedLines.length === 0) {
+    return {
+      ...state,
+      lines: [],
+      totalQuantity: 0,
+      cost: {
+        ...state.cost,
+        totalAmount: {
+          ...state.cost.totalAmount,
+          amount: '0'
+        }
+      }
+    };
+  }
+
   return {
     ...state,
     lines: updatedLines,