diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java
index 39efaf990..6db530c3a 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java
@@ -149,6 +149,7 @@ class EntityMap_1_10 extends EntityMap
             case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
+                rewriteMetaVarInt( packet, oldId, newId, 13 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java
index 6047fcb5f..368221275 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java
@@ -150,6 +150,7 @@ class EntityMap_1_11 extends EntityMap
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 13 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java
index 542214659..38e12ce40 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java
@@ -150,6 +150,7 @@ class EntityMap_1_12 extends EntityMap
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 13 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java
index 75d651c57..5f2968394 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java
@@ -150,6 +150,7 @@ class EntityMap_1_12_1 extends EntityMap
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 13 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java
index d737fe251..f3372f088 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java
@@ -150,6 +150,7 @@ class EntityMap_1_13 extends EntityMap
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6, protocolVersion ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7, protocolVersion ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 13, protocolVersion ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java
index e9702b16f..8210b0a7e 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java
@@ -149,6 +149,7 @@ class EntityMap_1_14 extends EntityMap
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 7, protocolVersion ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 8, protocolVersion ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 15, protocolVersion ); // guardian beam
                 break;
             case 0x50 /* Entity Sound Effect : PacketPlayOutEntitySound */:
                 DefinedPacket.readVarInt( packet );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java
index ea9e5ec9d..c2cf810f3 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java
@@ -149,6 +149,7 @@ class EntityMap_1_15 extends EntityMap
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 7, protocolVersion ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 8, protocolVersion ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 16, protocolVersion ); // guardian beam
                 break;
             case 0x51 /* Entity Sound Effect : PacketPlayOutEntitySound */:
                 DefinedPacket.readVarInt( packet );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java
index a4d0ea3f9..d61dc0cba 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java
@@ -149,6 +149,7 @@ class EntityMap_1_9 extends EntityMap
             case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 5 ); // fishing hook
+                rewriteMetaVarInt( packet, oldId, newId, 12 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java
index ae7ff10e5..bfbc84327 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java
@@ -149,6 +149,7 @@ class EntityMap_1_9_4 extends EntityMap
             case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 5 ); // fishing hook
+                rewriteMetaVarInt( packet, oldId, newId, 12 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );