diff --git a/patches/net/minecraft/client/renderer/entity/EntityRenderer.java.patch b/patches/net/minecraft/client/renderer/entity/EntityRenderer.java.patch
index 2e7b86b284..409ec676f6 100644
--- a/patches/net/minecraft/client/renderer/entity/EntityRenderer.java.patch
+++ b/patches/net/minecraft/client/renderer/entity/EntityRenderer.java.patch
@@ -9,20 +9,20 @@
              this.renderNameTag(p_364816_, p_364816_.nameTag, p_114488_, p_114489_, p_114490_);
          }
      }
-@@ -270,7 +_,12 @@
+@@ -270,9 +_,11 @@
          }
  
          p_361028_.distanceToCameraSq = this.entityRenderDispatcher.distanceToSqr(p_362104_);
 -        boolean flag = p_361028_.distanceToCameraSq < 4096.0 && this.shouldShowName(p_362104_, p_361028_.distanceToCameraSq);
-+        boolean flag = p_361028_.distanceToCameraSq < 4096.0;
-+        if (flag) {
-+            var event = new net.neoforged.neoforge.client.event.RenderNameTagEvent.CanRender(p_362104_, p_361028_, p_362104_.getDisplayName(), this, p_362204_);
-+            net.neoforged.neoforge.common.NeoForge.EVENT_BUS.post(event);
-+            flag = event.canRender().isTrue() || (event.canRender().isDefault() && this.shouldShowName(p_362104_, p_361028_.distanceToCameraSq));
-+        }
++        var event = new net.neoforged.neoforge.client.event.RenderNameTagEvent.CanRender(p_362104_, p_361028_, this.getNameTag(p_362104_), this, p_362204_);
++        net.neoforged.neoforge.common.NeoForge.EVENT_BUS.post(event);
++        boolean flag = event.canRender().isTrue() || (event.canRender().isDefault() && p_361028_.distanceToCameraSq < 4096.0 && this.shouldShowName(p_362104_, p_361028_.distanceToCameraSq));
          if (flag) {
-             p_361028_.nameTag = this.getNameTag(p_362104_);
+-            p_361028_.nameTag = this.getNameTag(p_362104_);
++            p_361028_.nameTag = event.getContent();
              p_361028_.nameTagAttachment = p_362104_.getAttachments().getNullable(EntityAttachment.NAME_TAG, 0, p_362104_.getYRot(p_362204_));
+         } else {
+             p_361028_.nameTag = null;
 @@ -302,5 +_,7 @@
          }
  
diff --git a/src/main/java/net/neoforged/neoforge/client/event/RenderNameTagEvent.java b/src/main/java/net/neoforged/neoforge/client/event/RenderNameTagEvent.java
index 6e6c501f2f..a33fc96ffe 100644
--- a/src/main/java/net/neoforged/neoforge/client/event/RenderNameTagEvent.java
+++ b/src/main/java/net/neoforged/neoforge/client/event/RenderNameTagEvent.java
@@ -16,6 +16,7 @@
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.common.util.TriState;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This event is fired before an entity renderer renders the nameplate of an entity.
@@ -26,14 +27,12 @@
  */
 public abstract class RenderNameTagEvent extends Event {
     private final EntityRenderState renderState;
-    protected final Component originalContent;
     private final EntityRenderer<?, ?> entityRenderer;
     private final float partialTick;
 
     @ApiStatus.Internal
-    public RenderNameTagEvent(EntityRenderState renderState, Component content, EntityRenderer<?, ?> entityRenderer, float partialTick) {
+    public RenderNameTagEvent(EntityRenderState renderState, EntityRenderer<?, ?> entityRenderer, float partialTick) {
         this.renderState = renderState;
-        this.originalContent = content;
         this.entityRenderer = entityRenderer;
         this.partialTick = partialTick;
     }
@@ -69,12 +68,16 @@ public float getPartialTick() {
      */
     public static class CanRender extends RenderNameTagEvent {
         private final Entity entity;
+        @Nullable
+        private final Component originalContent;
+        @Nullable
         private Component content;
         private TriState canRender = TriState.DEFAULT;
 
-        public CanRender(Entity entity, EntityRenderState renderState, Component content, EntityRenderer<?, ?> entityRenderer, float partialTick) {
-            super(renderState, content, entityRenderer, partialTick);
+        public CanRender(Entity entity, EntityRenderState renderState, @Nullable Component content, EntityRenderer<?, ?> entityRenderer, float partialTick) {
+            super(renderState, entityRenderer, partialTick);
             this.entity = entity;
+            this.originalContent = content;
             this.content = content;
         }
 
@@ -88,6 +91,7 @@ public Entity getEntity() {
         /**
          * {@return the original text on the nameplate}
          */
+        @Nullable
         public Component getOriginalContent() {
             return this.originalContent;
         }
@@ -121,6 +125,7 @@ public void setContent(Component contents) {
         /**
          * {@return the text on the nameplate that will be rendered}
          */
+        @Nullable
         public Component getContent() {
             return this.content;
         }
@@ -137,12 +142,14 @@ public Component getContent() {
      * @see EntityRenderer
      */
     public static class DoRender extends RenderNameTagEvent implements ICancellableEvent {
+        private final Component content;
         private final PoseStack poseStack;
         private final MultiBufferSource multiBufferSource;
         private final int packedLight;
 
         public DoRender(EntityRenderState renderState, Component content, EntityRenderer<?, ?> entityRenderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, float partialTick) {
-            super(renderState, content, entityRenderer, partialTick);
+            super(renderState, entityRenderer, partialTick);
+            this.content = content;
             this.poseStack = poseStack;
             this.multiBufferSource = multiBufferSource;
             this.packedLight = packedLight;
@@ -152,7 +159,7 @@ public DoRender(EntityRenderState renderState, Component content, EntityRenderer
          * {@return the text on the nameplate}
          */
         public Component getContent() {
-            return this.originalContent;
+            return this.content;
         }
 
         /**