diff --git a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala
index 64d321d76..1798aa6b4 100644
--- a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala
+++ b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala
@@ -186,6 +186,7 @@ class RobotProxy(val parent: SpecialDelegator) extends RedstoneAware with Specia
         val robot = proxy.robot
         if (!world.isRemote) {
           if (robot.player == player) return false
+          robot.node.remove()
           robot.saveComponents()
           parent.internalDropBlockAsItem(world, x, y, z, robot.info.createItemStack())
         }