diff --git a/code/datums/spells/shapeshift.dm b/code/datums/spells/shapeshift.dm
index 97daf8a6bbe..289e0e2c5c3 100644
--- a/code/datums/spells/shapeshift.dm
+++ b/code/datums/spells/shapeshift.dm
@@ -42,8 +42,8 @@
 			to_chat(caster, "<span class='warning'>You're already shapeshifted!</span>")
 			return
 
-	var/mob/living/shape = new shapeshift_type(caster.loc)
-	caster.loc = shape
+	var/mob/living/shape = new shapeshift_type(get_turf(caster))
+	caster.forceMove(shape)
 	caster.status_flags |= GODMODE
 
 	current_shapes |= shape
@@ -61,7 +61,7 @@
 			break
 	if(!caster)
 		return
-	caster.loc = shape.loc
+	caster.forceMove(get_turf(shape))
 	caster.status_flags &= ~GODMODE
 
 	clothes_req = initial(clothes_req)