diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
index cd80bce22..6ff7a447d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
@@ -281,8 +281,8 @@ public class DeployerHandler {
 		ActionResult<ItemStack> onItemRightClick = item.onItemRightClick(itemUseWorld, player, hand);
 		player.setHeldItem(hand, onItemRightClick.getResult());
 
-		CompoundNBT tag = stack.getOrCreateTag();
-		if (stack.getItem() instanceof SandPaperItem && tag.contains("Polishing"))
+		CompoundNBT tag = stack.getTag();
+		if (tag != null && stack.getItem() instanceof SandPaperItem && tag.contains("Polishing"))
 			player.spawnedItemEffects = ItemStack.read(tag.getCompound("Polishing"));
 
 		if (!player.getActiveItemStack()