diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
index a5ff63f79..7bb4a8a19 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
@@ -15,7 +15,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiTypes
 import net.minecraft.world.item.DyeColor
 import net.minecraft.world.item.DyeableArmorItem
 import net.minecraft.world.item.Item
-import net.minecraft.world.item.Items
+import net.minecraft.world.item.ShieldItem
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.block.*
 import net.minecraft.world.level.block.state.BlockBehaviour
@@ -30,7 +30,7 @@ import net.minecraftforge.eventbus.api.IEventBus
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent
 import net.minecraftforge.fml.loading.FMLEnvironment
-import net.minecraftforge.registries.DeferredRegister
+import net.minecraftforge.registries.ForgeRegistries
 import net.minecraftforge.registries.NewRegistryEvent
 import net.minecraftforge.registries.RegisterEvent
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
@@ -406,7 +406,8 @@ object MRegistry : IBlockItemRegistryAcceptor {
 	}
 
 	private fun registerItemDecorators(event: RegisterItemDecorationsEvent) {
-		event.register(Items.SHIELD, MatteryGUI::renderShieldCooldownOverlay)
-		event.register(MItems.TRITANIUM_SHIELD, MatteryGUI::renderShieldCooldownOverlay)
+		ForgeRegistries.ITEMS.filterIsInstance<ShieldItem>().forEach {
+			event.register(it, MatteryGUI::renderShieldCooldownOverlay)
+		}
 	}
 }