diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
index 92f257d7..935479c0 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
@@ -68,6 +68,8 @@ public class PistonHandler implements BackwardsBlockEntityProvider.BackwardsBloc
     @Override
     public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
         CompoundTag blockState = tag.get("blockState");
+        if (blockState == null) return tag;
+
         String dataFromTag = getDataFromTag(blockState);
         if (dataFromTag == null) return tag;