diff --git a/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/Lua/LuaSetup.lua b/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/Lua/LuaSetup.lua
index 8b83b4fd5..eee2287b6 100644
--- a/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/Lua/LuaSetup.lua
+++ b/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/Lua/LuaSetup.lua
@@ -20,7 +20,7 @@ AddTableToGlobal(dofile(path .. "/Lua/CompatibilityLib.lua"))
 
 dofile(path .. "/Lua/DefaultHook.lua")
 
-Descriptors = LuaSetup.LuaUserData
+Descriptors = LuaUserData
 
 dofile(path .. "/Lua/DefaultLib/Utils/Math.lua")
 dofile(path .. "/Lua/DefaultLib/Utils/String.lua")
diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/LuaUserDataService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/LuaUserDataService.cs
index 3efb28799..e155784a8 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/LuaUserDataService.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/LuaUserDataService.cs
@@ -87,7 +87,10 @@ public class LuaUserDataService : ILuaUserDataService
             throw new ScriptRuntimeException($"tried to register a type that doesn't exist: {typeName}.");
         }
 
-        return UserData.RegisterType(type);
+        var descriptor = UserData.RegisterType(type);
+        descriptors.TryAdd(typeName, descriptor);
+
+        return descriptor;
     }
 
     public void RegisterExtensionType(string typeName)