diff --git a/build.gradle.kts b/build.gradle.kts
index c5feac7..0621b7a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,7 @@ val pluginName = findProperty("plugin_name")
 
 repositories {
     maven("https://maven.pvphub.me/releases")
+    maven("https://maven.pvphub.me/tofaa")
     maven("https://repo.viaversion.com")
     maven("https://repo.codemc.org/repository/maven-public/") {
         name = "codemc"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4000973..15d9d31 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ packetevents = "2.8.0"
 tab = "5.2.0"
 skinsrestorer = "15.6.4"
 caffeine = "3.2.0"
-entitylib = "+1f4aeef-SNAPSHOT"
+entitylib = "3.0.3-SNAPSHOT"
 bstats = "3.1.0"
 
 junit-jupiter = "5.13.0"
@@ -22,7 +22,7 @@ packetevents = { module = "com.github.retrooper:packetevents-spigot", version.re
 tab = { module = "com.github.NEZNAMY:TAB-API", version.ref = "tab" }
 skinsrestorer = { module = "net.skinsrestorer:skinsrestorer-api", version.ref = "skinsrestorer" }
 caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
-entitylib = { module = "me.tofaa.entitylib:spigot", version.ref = "entitylib" }
+entitylib = { module = "io.github.tofaa2:spigot", version.ref = "entitylib" }
 bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
 
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
diff --git a/src/main/java/com/mattmx/nametags/entity/NameTagEntityManager.java b/src/main/java/com/mattmx/nametags/entity/NameTagEntityManager.java
index 990b09e..d3b1658 100644
--- a/src/main/java/com/mattmx/nametags/entity/NameTagEntityManager.java
+++ b/src/main/java/com/mattmx/nametags/entity/NameTagEntityManager.java
@@ -62,8 +62,6 @@ public class NameTagEntityManager {
         final NameTagEntity removed = nameTagEntityByEntityId.remove(entity.getEntityId());
         if (removed != null) {
             nameTagEntityByPassengerEntityId.remove(removed.getPassenger().getEntityId());
-        } else {
-            throw new IllegalArgumentException("No cached NameTag by the passenger entity ID, this could be a memory leak.");
         }
 
         return removed;