diff --git a/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
index 475a95690a..618ffe286d 100644
--- a/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
@@ -3,7 +3,7 @@ Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, $timeout,
   $scope.removeEnabled = true
 
   $scope.deleteLineItem = (id) ->
-    if Cart.has_one_line_item()
+    if Cart.isOnlyItemInOrder(id)
       Messages.error(t 'orders_cannot_remove_the_final_item')
       $scope.removeEnabled = false
       $timeout (->
diff --git a/app/assets/javascripts/darkswarm/services/cart.js.coffee b/app/assets/javascripts/darkswarm/services/cart.js.coffee
index 380f0ccc41..22c3436d44 100644
--- a/app/assets/javascripts/darkswarm/services/cart.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/cart.js.coffee
@@ -115,8 +115,9 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
       @line_items = []
       localStorageService.clearAll() # One day this will have to be moar GRANULAR
 
-    has_one_line_item: =>
-      @line_items_finalised.length == 1
+    isOnlyItemInOrder: (id) =>
+      deletedItem = @line_items_finalised.find((item) -> item.id == id)
+      @line_items_finalised.filter((item) -> item.order_id == deletedItem.order_id).length == 1
 
     removeFinalisedLineItem: (id) =>
       @line_items_finalised = @line_items_finalised.filter (item) ->
diff --git a/app/serializers/api/line_item_serializer.rb b/app/serializers/api/line_item_serializer.rb
index 35d3f9c540..f8022caef3 100644
--- a/app/serializers/api/line_item_serializer.rb
+++ b/app/serializers/api/line_item_serializer.rb
@@ -1,5 +1,5 @@
 class Api::LineItemSerializer < ActiveModel::Serializer
-  attributes :id, :quantity, :max_quantity, :price
+  attributes :id, :quantity, :max_quantity, :price, :order_id
 
   has_one :variant, serializer: Api::VariantSerializer
 end
diff --git a/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
index 23ab473081..25e8e88dd9 100644
--- a/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
@@ -225,9 +225,10 @@ describe 'Cart service', ->
   describe "when modifying a confirmed order", ->
     it "displays flash error when attempting to remove final item", ->
       spyOn(RailsFlashLoader, 'loadFlash')
-      li = {variant: {id: 1}, quantity: 3}
-      Cart.line_items_finalised = [li]
-      expect(Cart.has_one_line_item()).toBe(true)
+      li = {id: 1, order_id: 1, variant: {id: 1}, quantity: 3}
+      li2 = {id: 2, order_id: 2, variant: {id: 2}, quantity: 1}
+      Cart.line_items_finalised = [li, li2]
+      expect(Cart.isOnlyItemInOrder(li.id)).toBe(true)
 
   it "pops the queue", ->
     Cart.update_enqueued = true