diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
index 7a1e32758..4c553b0ef 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
@@ -241,6 +241,12 @@ namespace Barotrauma.Items.Components
 
         public override void Update(float deltaTime, Camera cam)
         {
+            if (fabricatedItem == null)
+            {
+                CancelFabricating();
+                return;
+            }
+
 #if CLIENT
             if (progressBar != null)
             {