diff --git a/src/main/java/net/minecraftforge/registries/RegistryManager.java b/src/main/java/net/minecraftforge/registries/RegistryManager.java
index 45203a700..6957c8352 100644
--- a/src/main/java/net/minecraftforge/registries/RegistryManager.java
+++ b/src/main/java/net/minecraftforge/registries/RegistryManager.java
@@ -87,12 +87,13 @@ public class RegistryManager
 
     public <V extends IForgeRegistryEntry<V>> ResourceLocation updateLegacyName(ResourceLocation legacyName)
     {
+        ResourceLocation originalName = legacyName;
         while (getRegistry(legacyName) == null)
         {
             legacyName = legacyNames.get(legacyName);
             if (legacyName == null)
             {
-                return null;
+                return originalName;
             }
         }
         return legacyName;