diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 64a75ddd80..d5002977f8 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -31,9 +31,6 @@
 
 /obj/item/gun/energy/Initialize(mapload)
 	. = ..()
-	var/static/list/gun_icons = icon_states('icons/obj/gun_ch.dmi')
-	if (icon == 'icons/obj/gun_ch.dmi' && !(icon_state in gun_icons))
-		icon = 'icons/obj/gun.dmi'
 	if(self_recharge)
 		power_supply = new /obj/item/cell/device/weapon(src)
 		START_PROCESSING(SSobj, src)
diff --git a/modular_chomp/code/modules/projectiles/guns/energy.dm b/modular_chomp/code/modules/projectiles/guns/energy.dm
index 2f0b30109d..ebc4116fd4 100644
--- a/modular_chomp/code/modules/projectiles/guns/energy.dm
+++ b/modular_chomp/code/modules/projectiles/guns/energy.dm
@@ -47,3 +47,8 @@
 	//damage = 5
 	mob_bonus_damage = 35
 	armor_penetration = 0
+
+/obj/item/gun/energy/Initialize(mapload)
+	if(icon == 'icons/obj/gun_ch.dmi' && !(icon_state in cached_icon_states('icons/obj/gun_ch.dmi')))
+		icon = 'icons/obj/gun.dmi'
+	return ..()