diff --git a/src/backend/InvenTree/build/models.py b/src/backend/InvenTree/build/models.py
index 3faeb4e531..32a6883258 100644
--- a/src/backend/InvenTree/build/models.py
+++ b/src/backend/InvenTree/build/models.py
@@ -1254,7 +1254,9 @@ class Build(
         output.build = self
         output.is_building = False
         output.location = location
-        output.status = status
+
+        # Assign the stock status
+        output.set_status(status)
 
         output.save(add_note=False)
 
diff --git a/src/backend/InvenTree/order/models.py b/src/backend/InvenTree/order/models.py
index 9e79f8683c..ddb0a5d9cd 100644
--- a/src/backend/InvenTree/order/models.py
+++ b/src/backend/InvenTree/order/models.py
@@ -2910,7 +2910,7 @@ class ReturnOrder(TotalPriceMixin, Order):
             line.item = stock_item
             line.save()
 
-        status = kwargs.get('status')
+        status = kwargs.get('status', StockStatus.QUARANTINED.value)
 
         if status is None:
             status = StockStatus.QUARANTINED.value
@@ -2921,7 +2921,7 @@ class ReturnOrder(TotalPriceMixin, Order):
             deltas['customer'] = stock_item.customer.pk
 
         # Update the StockItem
-        stock_item.status = status
+        stock_item.set_status(status)
         stock_item.location = location
         stock_item.customer = None
         stock_item.sales_order = None