diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
index e2323ce4413..4c8f46b7fd4 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
@@ -60,3 +60,15 @@
 
 /obj/effect/projectile/tracer/sniper
 	icon_state = "sniper"
+
+/obj/effect/projectile/tracer/lightning
+	icon = 'icons/effects/beam.dmi'
+	icon_state = "lightning2"
+
+/obj/effect/projectile/tracer/lightning/Initialize(mapload)
+	. = ..()
+	update_appearance()
+
+/obj/effect/projectile/tracer/lightning/update_icon_state()
+	. = ..()
+	icon_state = "lightning[rand(1, 12)]"
diff --git a/code/modules/projectiles/projectile/energy/tesla.dm b/code/modules/projectiles/projectile/energy/tesla.dm
index 0af90c29fc0..928b3f31271 100644
--- a/code/modules/projectiles/projectile/energy/tesla.dm
+++ b/code/modules/projectiles/projectile/energy/tesla.dm
@@ -29,14 +29,10 @@
 	name = "tesla bolt"
 	icon_state = null
 	hitscan = TRUE
+	tracer_type = /obj/effect/projectile/tracer/lightning
+	impact_effect_type = null
 	damage = 5
 	var/shock_damage = 10
-	var/datum/beam/chain
-
-/obj/projectile/energy/tesla_cannon/fire(setAngle)
-	if(firer)
-		chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = 0.5 SECONDS)
-	return ..()
 
 /obj/projectile/energy/tesla_cannon/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()