diff --git a/src/main/scala/li/cil/oc/common/entity/Drone.scala b/src/main/scala/li/cil/oc/common/entity/Drone.scala
index 080899deb..a1873a020 100644
--- a/src/main/scala/li/cil/oc/common/entity/Drone.scala
+++ b/src/main/scala/li/cil/oc/common/entity/Drone.scala
@@ -467,7 +467,9 @@ class Drone(val world: World) extends Entity(world) with MachineHost with intern
   override def interactFirst(player: EntityPlayer) = {
     if (player.isSneaking) {
       if (Wrench.isWrench(player.getHeldItem)) {
-        kill()
+        if(!world.isRemote) {
+          kill()
+        }
       }
       else if (!world.isRemote && !machine.isRunning) {
         preparePowerUp()