diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/util/ComponentConverter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/util/ComponentConverter.java
index 5e8a2e1ea..831cede02 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/util/ComponentConverter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/util/ComponentConverter.java
@@ -193,16 +193,17 @@ public final class ComponentConverter {
             // Store show_entity id as int array instead of uuid string
             // Not really required, but we might as well make it more compact
             final JsonObject hoverEvent = value.getAsJsonObject();
+            final CompoundTag convertedTag = (CompoundTag) convertToTag(value);
+
             final JsonElement id = hoverEvent.get("id");
             final UUID uuid;
             if (id != null && id.isJsonPrimitive() && (uuid = UUIDUtil.parseUUID(id.getAsString())) != null) {
-                hoverEvent.remove("id");
-
-                final CompoundTag convertedTag = (CompoundTag) convertToTag(value);
+                convertedTag.remove("id");
                 convertedTag.put("id", new IntArrayTag(UUIDUtil.toIntArray(uuid)));
-                tag.put(key, convertedTag);
-                return;
             }
+
+            tag.put(key, convertedTag);
+            return;
         }
 
         tag.put(key, convertToTag(value));