diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTargetHandler.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTargetHandler.java
index 8d84b0c33..978f40a9b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTargetHandler.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTargetHandler.java
@@ -86,9 +86,6 @@ public class EjectorTargetHandler {
 	}
 
 	public static void flushSettings(BlockPos pos) {
-		if (currentItem == null)
-			return;
-
 		int h = 0;
 		int v = 0;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java
index 18b3eccd4..0fa1ed3d1 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java
@@ -89,7 +89,7 @@ public class ArmInteractionPointHandler {
 	}
 
 	public static void flushSettings(BlockPos pos) {
-		if (currentItem == null)
+		if (currentSelection == null)
 			return;
 
 		int removed = 0;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmTileEntity.java
index c4f74e047..2c9cd4a26 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmTileEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmTileEntity.java
@@ -66,6 +66,7 @@ public class ArmTileEntity extends KineticTileEntity implements ITransformableTE
 	LerpedFloat clawAngle;
 	float previousBaseAngle;
 	boolean updateInteractionPoints;
+	int tooltipWarmup;
 
 	//
 	protected ScrollOptionBehaviour<SelectionMode> selectionMode;
@@ -97,6 +98,7 @@ public class ArmTileEntity extends KineticTileEntity implements ITransformableTE
 		previousBaseAngle = previousTarget.baseAngle;
 		updateInteractionPoints = true;
 		redstoneLocked = false;
+		tooltipWarmup = 15;
 	}
 
 	@Override
@@ -118,6 +120,8 @@ public class ArmTileEntity extends KineticTileEntity implements ITransformableTE
 		initInteractionPoints();
 		boolean targetReached = tickMovementProgress();
 
+		if (tooltipWarmup > 0)
+			tooltipWarmup--;
 		if (chasedPointProgress < 1) {
 			if (phase == Phase.MOVE_TO_INPUT) {
 				ArmInteractionPoint point = getTargetedInteractionPoint();
@@ -561,6 +565,8 @@ public class ArmTileEntity extends KineticTileEntity implements ITransformableTE
 			return true;
 		if (isPlayerSneaking)
 			return false;
+		if (tooltipWarmup > 0)
+			return false;
 		if (!inputs.isEmpty())
 			return false;
 		if (!outputs.isEmpty())