diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt
index c5f0cc91b..b9661dec9 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt
@@ -7,7 +7,6 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.enchantment.Enchantments
 import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting
 import ru.dbotthepony.mc.otm.block.entity.tech.EssenceStorageBlockEntity
-import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.core.util.getTotalXpRequiredForLevel
 import ru.dbotthepony.mc.otm.item.EssenceCapsuleItem
 import ru.dbotthepony.mc.otm.item.EssenceServoItem
@@ -88,18 +87,10 @@ class EssenceStorageMenu @JvmOverloads constructor(
 	}
 
 	init {
-		storeLevels.filter {
-			it.isCreative || it.matteryPlayer?.isAndroid == true || servoSlot.item.item == MItems.ESSENCE_SERVO //|| it.itemsStream(true).anyMatch { it.item == MItems.ESSENCE_SERVO }
-		}
-
 		storeLevels.filter {
 			it.experienceProgress > 0f || it.experienceLevel > 0
 		}
 
-		dispenseLevels.filter {
-			it.isCreative || it.matteryPlayer?.isAndroid == true || servoSlot.item.item == MItems.ESSENCE_SERVO //|| it.itemsStream(true).anyMatch { it.item == MItems.ESSENCE_SERVO }
-		}
-
 		dispenseLevels.filter { (tile?.experienceStored ?: experienceStored) > 0L }
 
 		if (tile != null) {
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..e53a262a6 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,10 @@ object MRegistry : IBlockItemRegistryAcceptor {
 	}
 
 	private fun registerItemDecorators(event: RegisterItemDecorationsEvent) {
-		event.register(Items.SHIELD, MatteryGUI::renderShieldCooldownOverlay)
-		event.register(MItems.TRITANIUM_SHIELD, MatteryGUI::renderShieldCooldownOverlay)
+		ForgeRegistries.ITEMS.forEach {
+			if (it is ShieldItem) {
+				event.register(it, MatteryGUI::renderShieldCooldownOverlay)
+			}
+		}
 	}
 }