diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
index f304cac05..f4196e147 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
@@ -125,6 +125,7 @@ public final class OverdriveThatMatters {
 		MDataComponentTypes.INSTANCE.register(bus);
 		MArmorMaterials.INSTANCE.register(bus);
 		MCriteriaTriggers.INSTANCE.register(bus);
+		MStats.INSTANCE.register(bus);
 
 		StorageStack.Companion.register(bus);
 		MatteryChestMenu.Companion.register(bus);
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MStats.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MStats.kt
index cc44c5dd6..1408348a3 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MStats.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MStats.kt
@@ -1,20 +1,29 @@
 package ru.dbotthepony.mc.otm.registry
 
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.stats.StatFormatter
 import net.minecraft.stats.Stats
+import net.neoforged.bus.api.IEventBus
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent
 import ru.dbotthepony.mc.otm.registry.StatNames.DAMAGE_ABSORBED
 import ru.dbotthepony.mc.otm.registry.StatNames.HEALTH_REGENERATED
 import ru.dbotthepony.mc.otm.registry.StatNames.POWER_CONSUMED
 
 object MStats {
+	private val registrar = MDeferredRegister(BuiltInRegistries.CUSTOM_STAT)
+
+	fun register(bus: IEventBus) {
+		registrar.register(bus)
+	}
+
+	init {
+		registrar.register(DAMAGE_ABSORBED, DAMAGE_ABSORBED)
+		registrar.register(HEALTH_REGENERATED, HEALTH_REGENERATED)
+		registrar.register(POWER_CONSUMED, POWER_CONSUMED)
+	}
+
 	fun registerVanilla(event: FMLCommonSetupEvent) {
 		event.enqueueWork {
-			Registry.register(BuiltInRegistries.CUSTOM_STAT, DAMAGE_ABSORBED, DAMAGE_ABSORBED)
-			Registry.register(BuiltInRegistries.CUSTOM_STAT, HEALTH_REGENERATED, HEALTH_REGENERATED)
-			Registry.register(BuiltInRegistries.CUSTOM_STAT, POWER_CONSUMED, POWER_CONSUMED)
 			Stats.CUSTOM[DAMAGE_ABSORBED, StatFormatter.DIVIDE_BY_TEN]
 			Stats.CUSTOM[HEALTH_REGENERATED, StatFormatter.DIVIDE_BY_TEN]
 			Stats.CUSTOM[POWER_CONSUMED, StatFormatter.DIVIDE_BY_TEN]