diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index ea956a00d2..c4e3372524 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -29,7 +29,7 @@
 /obj/item/weapon/gun/energy/New()
 	..()
 	var/static/list/gun_icons = icon_states('icons/obj/gun_ch.dmi')
-	if (!(icon_state in gun_icons))
+	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/weapon/cell/device/weapon(src)
@@ -262,4 +262,4 @@
 	if(!power_supply)
 		return 0
 	else
-		return FLOOR(power_supply.charge / max(charge_cost, 1), 1)
\ No newline at end of file
+		return FLOOR(power_supply.charge / max(charge_cost, 1), 1)