diff --git a/code/defines/atom.dm b/code/defines/atom.dm
index 7a249386de6..1991e1c3bf3 100644
--- a/code/defines/atom.dm
+++ b/code/defines/atom.dm
@@ -169,7 +169,6 @@ obj
 	src.m_flag = 1
 	if ((A != src.loc && A && A.z == src.z))
 		src.last_move = get_dir(A, src.loc)
-		src.moved_recently = 1
 	return
 
 /*
diff --git a/code/game/objects/radio/electropack.dm b/code/game/objects/radio/electropack.dm
index 512a8cd4788..209fbea8b53 100644
--- a/code/game/objects/radio/electropack.dm
+++ b/code/game/objects/radio/electropack.dm
@@ -130,8 +130,12 @@
 		var/mob/M = src.loc
 		var/turf/T = M.loc
 		if ((istype(T, /turf)))
-			if (M.moved_recently && M.last_move)
+			if (!M.moved_recently && M.last_move)
+				M.moved_recently = 1
 				step(M, M.last_move)
+				sleep 50
+				if(M)
+					M.moved_recently = 0
 		M.show_message("\red <B>You feel a sharp shock!</B>")
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 		s.set_up(3, 1, M)