diff --git a/Subsurface/Source/Items/CharacterInventory.cs b/Subsurface/Source/Items/CharacterInventory.cs
index aa5db2de2..d29cf9a83 100644
--- a/Subsurface/Source/Items/CharacterInventory.cs
+++ b/Subsurface/Source/Items/CharacterInventory.cs
@@ -299,6 +299,8 @@ namespace Barotrauma
             Rectangle slotRect = new Rectangle(0, 0, rectWidth, rectHeight);
             for (int i = 0; i < capacity; i++)
             {
+                if (slots[i] == null) slots[i] = new InventorySlot(slotRect);
+
                 slots[i].Disabled = false;
 
                 slotRect.X = (int)(SlotPositions[i].X + DrawOffset.X);