diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 86d7e43e1b..7319945f49 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -125,6 +125,7 @@
 	if(isnum(set_duration)) //TODO, figure out how to grab from subtype
 		duration = set_duration
 	. = ..()
+	last_tick = world.time
 	if(iscarbon(owner))
 		var/mob/living/carbon/C = owner
 		if(C.combatmode)
diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm
index 5c4827d0a7..ea7c013cbd 100644
--- a/code/modules/projectiles/projectile/energy/stun.dm
+++ b/code/modules/projectiles/projectile/energy/stun.dm
@@ -2,7 +2,7 @@
 	name = "electrode"
 	icon_state = "spark"
 	color = "#FFFF00"
-	nodamage = 1
+	nodamage = TRUE
 	knockdown = 60
 	knockdown_stamoverride = 36
 	knockdown_stam_max = 50
@@ -38,8 +38,9 @@
 /obj/item/projectile/energy/electrode/security
 	tase_duration = 20
 	knockdown = 0
-	knockdown_stamoverride = 5
-	knockdown_stam_max = 15
+	stamina = 5
+	knockdown_stamoverride = 0
+	knockdown_stam_max = 0
 	strong_tase = FALSE
 
 /obj/item/projectile/energy/electrode/security/hos