diff --git a/Minecraft.Client/EnderDragonRenderer.cpp b/Minecraft.Client/EnderDragonRenderer.cpp
index 44e92192..da6e7bf8 100644
--- a/Minecraft.Client/EnderDragonRenderer.cpp
+++ b/Minecraft.Client/EnderDragonRenderer.cpp
@@ -89,10 +89,11 @@ void EnderDragonRenderer::render(shared_ptr<Entity> _mob, double x, double y, do
 	// 4J - dynamic cast required because we aren't using templates/generics in our version
 	shared_ptr<EnderDragon> mob = dynamic_pointer_cast<EnderDragon>(_mob);
 	BossMobGuiInfo::setBossHealth(mob, false);
-    if (!mob->getCustomName().empty())
-    {
-        BossMobGuiInfo::name = mob->getCustomName();
-    }
+    // GeorgeV22 - BossMobGuiInfo::setBossHealth already handles this
+    // if (!mob->getCustomName().empty())
+    // {
+    //     BossMobGuiInfo::name = mob->getCustomName();
+    // }
 
 	MobRenderer::render(mob, x, y, z, rot, a);
 	if (mob->nearestCrystal != nullptr)
diff --git a/Minecraft.Client/WitherBossRenderer.cpp b/Minecraft.Client/WitherBossRenderer.cpp
index dc1d8f92..736d1e41 100644
--- a/Minecraft.Client/WitherBossRenderer.cpp
+++ b/Minecraft.Client/WitherBossRenderer.cpp
@@ -20,10 +20,11 @@ void WitherBossRenderer::render(shared_ptr<Entity> entity, double x, double y, d
 	shared_ptr<WitherBoss> mob = dynamic_pointer_cast<WitherBoss>(entity);
 
 	BossMobGuiInfo::setBossHealth(mob, true);
-    if (!mob->getCustomName().empty())
-	{
-        BossMobGuiInfo::name = mob->getCustomName();
-	}
+    // GeorgeV22 - BossMobGuiInfo::setBossHealth already handles this
+    // if (!mob->getCustomName().empty())
+    // {
+    //     BossMobGuiInfo::name = mob->getCustomName();
+    // }
 
 	int modelVersion = dynamic_cast<WitherBossModel*>(model)->modelVersion();
 	if (modelVersion != this->modelVersion)