diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 742d3a5fda1..85b1d967db1 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -63,9 +63,9 @@
 					target.canmove = 1
 					return
 			for(var/turf/space/S in orange(7)) //loop for space turfs in case there were no normal ones last loop
-				if(target.Move(S))
-					target.canmove = 1
-				return
+				if(S && target.Move(S))
+					break
+		target.canmove = 1 //if there are no valid tiles in a range of 7, just let them spawn wherever they are currently
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
 	var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()