diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 42096866c4..0e028ed4af 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -134,9 +134,7 @@
 			to_chat(user, "<span class='warning'>The plating is going to need some support! Place metal rods first.</span>")
 
 /turf/open/space/Entered(atom/movable/A, atom/OldLoc)
-	..()
-	if ((!(A) || src != A.loc))
-		return
+	. = ..()
 	
 	var/turf/old = get_turf(OldLoc)
 	if(!isspaceturf(old) && ismob(A))
@@ -175,6 +173,12 @@
 		stoplag()//Let a diagonal move finish, if necessary
 		A.newtonian_move(A.inertia_dir)
 
+/turf/open/space/Exited(atom/movable/AM, atom/OldLoc)
+	. = ..()
+	var/turf/old = get_turf(OldLoc)
+	if(!isspaceturf(old) && ismob(AM))
+		var/mob/M = AM
+		M.update_gravity(M.mob_has_gravity())
 
 /turf/open/space/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
 	return