diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
index 63c6e6a5b..7e1e11c71 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
@@ -738,8 +738,13 @@ class Robot extends traits.Computer with traits.PowerInformation with IFluidHand
   override def dropSlot(slot: Int, count: Int, direction: Option[ForgeDirection]) =
     InventoryUtils.dropSlot(BlockPosition(x, y, z, world), dynamicInventory, slot, count, direction)
 
-  override def dropAllSlots() =
+  override def dropAllSlots() = {
+    InventoryUtils.dropSlot(BlockPosition(x, y, z, world), this, 0, Int.MaxValue)
+    for (slot <- containerSlots) {
+      InventoryUtils.dropSlot(BlockPosition(x, y, z, world), this, slot, Int.MaxValue)
+    }
     InventoryUtils.dropAllSlots(BlockPosition(x, y, z, world), dynamicInventory)
+  }
 
   // ----------------------------------------------------------------------- //