diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm
index ef5f1d02e0e..be73848e2e7 100644
--- a/code/game/objects/effects/effect_system/effects_water.dm
+++ b/code/game/objects/effects/effect_system/effects_water.dm
@@ -26,7 +26,7 @@
 
 /obj/effect/particle_effect/water/proc/extinguish_move(turf/target)
 	for(var/counter in 1 to 5)
-		if(!step_towards(src, target))
+		if(!step_towards(src, target) && counter != 1)
 			return
 		var/turf/current_turf = get_turf(src)
 		reagents.reaction(current_turf)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index e493a7c0c95..9d28a5b3038 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -79,7 +79,7 @@
 	D.icon += mix_color_from_reagents(D.reagents.reagent_list)
 
 	for(var/i in 1 to spray_currentrange)
-		if(!step_towards(D, A))
+		if(!step_towards(D, A) && i != 1)
 			qdel(D)
 			return
 		D.reagents.reaction(get_turf(D))