diff --git a/connector/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java b/connector/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java
index 1f766478..1adc1871 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java
@@ -1,8 +1,11 @@
 package org.geysermc.connector.entity;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
 import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.data.EntityFlag;
 import com.nukkitx.protocol.bedrock.packet.AddEntityPacket;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
@@ -16,7 +19,20 @@ public class EnderCrystalEntity extends Entity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
-        System.out.println("ID: " + entityMetadata.getId() + ", " + entityMetadata.getValue());
+        // Show beam
+        // Usually performed client-side on Bedrock except for Ender Dragon respawn event
+        if (entityMetadata.getId() == 7) {
+            if (entityMetadata.getValue() instanceof Position) {
+                Position pos = (Position) entityMetadata.getValue();
+                metadata.put(EntityData.BLOCK_TARGET, Vector3i.from(pos.getX(), pos.getY(), pos.getZ()));
+            } else {
+                metadata.put(EntityData.BLOCK_TARGET, Vector3i.ZERO);
+            }
+        }
+        // There is a base located on the ender crystal
+        if (entityMetadata.getId() == 8) {
+            metadata.getFlags().setFlag(EntityFlag.SHOW_BOTTOM, (boolean) entityMetadata.getValue());
+        }
         super.updateBedrockMetadata(entityMetadata, session);
     }
 
diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java
index db8e8589..309eef14 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java
@@ -3,7 +3,6 @@ package org.geysermc.connector.entity.living.monster;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.data.Attribute;
-import com.nukkitx.protocol.bedrock.data.EntityData;
 import com.nukkitx.protocol.bedrock.data.EntityEventType;
 import com.nukkitx.protocol.bedrock.data.EntityFlag;
 import com.nukkitx.protocol.bedrock.packet.AddEntityPacket;
diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java
index 40573df6..a2970ff2 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java
@@ -2,7 +2,6 @@ package org.geysermc.connector.entity.living.monster;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
-import com.github.steveice10.mc.protocol.data.game.world.block.value.PistonValueType;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.data.EntityData;
 import com.nukkitx.protocol.bedrock.data.EntityFlag;
@@ -18,17 +17,15 @@ public class EndermanEntity extends MonsterEntity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        // Held block
         if (entityMetadata.getId() == 15) {
-            System.out.println("Block: " + entityMetadata.getValue());
             metadata.put(EntityData.ENDERMAN_HELD_ITEM_ID, BlockTranslator.getBedrockBlockId((BlockState) entityMetadata.getValue()));
         }
+        // 'Angry' - mouth open
         if (entityMetadata.getId() == 16) {
-            System.out.println("Is screaming? " + (boolean) entityMetadata.getValue());
             metadata.getFlags().setFlag(EntityFlag.ANGRY, (boolean) entityMetadata.getValue());
         }
-        if (entityMetadata.getId() == 17) {
-            System.out.println("Is stared at? " + (boolean) entityMetadata.getValue());
-        }
+        // TODO: ID 17 is stared at but I don't believe it's used - maybe only for the sound effect. Check after particle merge
         super.updateBedrockMetadata(entityMetadata, session);
     }
 }