diff --git a/src/main/java/software/bernie/geckolib3q/renderers/geo/GeoEntityRenderer.java b/src/main/java/software/bernie/geckolib3q/renderers/geo/GeoEntityRenderer.java
index 891e7a2a7..19161bb9d 100644
--- a/src/main/java/software/bernie/geckolib3q/renderers/geo/GeoEntityRenderer.java
+++ b/src/main/java/software/bernie/geckolib3q/renderers/geo/GeoEntityRenderer.java
@@ -334,7 +334,7 @@ protected boolean hasLabel(T entity) {
 		if (d0 >= (double) (f * f)) {
 			return false;
 		} else {
-			return entity == this.dispatcher.targetedEntity && entity.hasCustomName();
+			return entity == this.dispatcher.targetedEntity && entity.hasCustomName() && MinecraftClient.isHudEnabled();
 		}
 	}
 
diff --git a/src/main/java/software/bernie/geckolib3q/renderers/geo/GeoReplacedEntityRenderer.java b/src/main/java/software/bernie/geckolib3q/renderers/geo/GeoReplacedEntityRenderer.java
index 27d8cb2ee..8206077a3 100644
--- a/src/main/java/software/bernie/geckolib3q/renderers/geo/GeoReplacedEntityRenderer.java
+++ b/src/main/java/software/bernie/geckolib3q/renderers/geo/GeoReplacedEntityRenderer.java
@@ -258,7 +258,7 @@ protected boolean hasLabel(Entity entity) {
 		if (d0 >= (double) (f * f)) {
 			return false;
 		} else {
-			return entity == this.dispatcher.targetedEntity && entity.hasCustomName();
+			return entity == this.dispatcher.targetedEntity && entity.hasCustomName() && MinecraftClient.isHudEnabled();
 		}
 	}
 
@@ -338,12 +338,12 @@ public <E extends Entity> void renderLeash(MobEntity entity, float partialTicks,
 		int s = entity.world.getLightLevel(LightType.SKY, blockPos);
 		int t = entity.world.getLightLevel(LightType.SKY, blockPos2);
 		for (u = 0; u <= 24; ++u) {
-			GeoReplacedEntityRenderer.renderLeashPiece(vertexConsumer, matrix4f, j, k, l, q, r, s, t, 0.025f, 0.025f, o, p, u,
-					false);
+			GeoReplacedEntityRenderer.renderLeashPiece(vertexConsumer, matrix4f, j, k, l, q, r, s, t, 0.025f, 0.025f, o,
+					p, u, false);
 		}
 		for (u = 24; u >= 0; --u) {
-			GeoReplacedEntityRenderer.renderLeashPiece(vertexConsumer, matrix4f, j, k, l, q, r, s, t, 0.025f, 0.0f, o, p, u,
-					true);
+			GeoReplacedEntityRenderer.renderLeashPiece(vertexConsumer, matrix4f, j, k, l, q, r, s, t, 0.025f, 0.0f, o,
+					p, u, true);
 		}
 		poseStack.pop();
 	}