diff --git a/src/main/java/li/cil/oc2/common/entity/Robot.java b/src/main/java/li/cil/oc2/common/entity/Robot.java
index ed488dea..f4124411 100644
--- a/src/main/java/li/cil/oc2/common/entity/Robot.java
+++ b/src/main/java/li/cil/oc2/common/entity/Robot.java
@@ -311,6 +311,14 @@ public final class Robot extends Entity implements li.cil.oc2.api.capabilities.R
         }
     }
 
+    @Override
+    public boolean skipAttackInteraction(final Entity entity) {
+        if (entity instanceof Player player && player.isCreative()) {
+            dropSelf();
+        }
+        return true;
+    }
+
     @Override
     public InteractionResult interact(final Player player, final InteractionHand hand) {
         final ItemStack stack = player.getItemInHand(hand);