diff --git a/src/main/java/net/minecraftforge/registries/ForgeRegistry.java b/src/main/java/net/minecraftforge/registries/ForgeRegistry.java
index 51a737cc63..287a549d9f 100644
--- a/src/main/java/net/minecraftforge/registries/ForgeRegistry.java
+++ b/src/main/java/net/minecraftforge/registries/ForgeRegistry.java
@@ -685,10 +685,16 @@ public class ForgeRegistry<V> implements IForgeRegistryInternal<V>, IForgeRegist
      */
     public void freeze() {
         this.isFrozen = true;
+        var wrapper = this.getWrapper();
+        if (wrapper != null)
+            wrapper.locked = true;
     }
 
     public void unfreeze() {
         this.isFrozen = false;
+        var wrapper = this.getWrapper();
+        if (wrapper != null)
+            wrapper.locked = false;
     }
 
     void dump(ResourceLocation name) {