diff --git a/proxy/pom.xml b/proxy/pom.xml
index a682d3c6c..c2b454ff4 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -24,12 +24,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.flowpowered</groupId>
-            <artifactId>flow-nbt</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-haproxy</artifactId>
@@ -91,6 +85,12 @@
             <version>5.0.4</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>se.llbit</groupId>
+            <artifactId>jo-nbt</artifactId>
+            <version>1.3.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index b15045f6f..fe900fcfe 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -1,14 +1,15 @@
 package net.md_5.bungee.entitymap;
 
-import com.flowpowered.nbt.stream.NBTInputStream;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
-import java.io.IOException;
+import java.io.DataInputStream;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.DefinedPacket;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import se.llbit.nbt.NamedTag;
+import se.llbit.nbt.Tag;
 
 /**
  * Class to rewrite integers within packets.
@@ -252,12 +253,10 @@ public abstract class EntityMap
                     DefinedPacket.readVarInt( packet );
                     break;
                 case 13:
-                    try
+                    Tag tag = NamedTag.read( new DataInputStream( new ByteBufInputStream( packet ) ) );
+                    if ( tag.isError() )
                     {
-                        new NBTInputStream( new ByteBufInputStream( packet ), false ).readTag();
-                    } catch ( IOException ex )
-                    {
-                        throw new RuntimeException( ex );
+                        throw new RuntimeException( tag.error() );
                     }
                     break;
                 case 15:
@@ -300,12 +299,10 @@ public abstract class EntityMap
             {
                 packet.readerIndex( position );
 
-                try
+                Tag tag = NamedTag.read( new DataInputStream( new ByteBufInputStream( packet ) ) );
+                if ( tag.isError() )
                 {
-                    new NBTInputStream( new ByteBufInputStream( packet ), false ).readTag();
-                } catch ( IOException ex )
-                {
-                    throw new RuntimeException( ex );
+                    throw new RuntimeException( tag.error() );
                 }
             }
         }