diff --git a/src/engine/gameManager/ForgeManager.java b/src/engine/gameManager/ForgeManager.java
index 869d2f8a..ecee0905 100644
--- a/src/engine/gameManager/ForgeManager.java
+++ b/src/engine/gameManager/ForgeManager.java
@@ -327,12 +327,12 @@ public enum ForgeManager implements Runnable {
 
             // Remove the virtual items from the forge window
 
-            workOrder.cooking.remove(workOrderItem);
-            itemWorkOrderLookup.remove(workOrderItem);
-
             ItemProductionMsg outMsg = new ItemProductionMsg(workOrder.vendor.building, workOrder.vendor, workOrderItem, mbEnums.ProductionActionType.CONFIRM_SETPRICE, true);
             DispatchMessage.dispatchMsgToInterestArea(workOrder.vendor, outMsg, mbEnums.DispatchChannel.SECONDARY, 700, false, false);
 
+            workOrder.cooking.remove(workOrderItem);
+            itemWorkOrderLookup.remove(workOrderItem);
+
             // Persist item
 
             Item completedItem = DbManager.ItemQueries.PERSIST(workOrderItem);