diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index dabbe93bec..f87f7a757c 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -516,7 +516,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 			used_environ += amount
 
 
-/area/Entered(atom/movable/M)
+/area/Entered(atom/movable/M, atom/OldLoc)
 	set waitfor = FALSE
 	SEND_SIGNAL(src, COMSIG_AREA_ENTERED, M)
 	SEND_SIGNAL(M, COMSIG_ENTER_AREA, src) //The atom that enters the area
@@ -524,6 +524,11 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 		return
 
 	var/mob/living/L = M
+	var/turf/oldTurf = get_turf(OldLoc)
+	var/area/A = oldTurf?.loc
+	if(A && (A.has_gravity != has_gravity))
+		L.update_gravity(L.mob_has_gravity())
+
 	if(!L.ckey)
 		return
 
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index b131a1ed70..0e028ed4af 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -133,10 +133,13 @@
 		else
 			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)
-	..()
-	if ((!(A) || src != A.loc))
-		return
+/turf/open/space/Entered(atom/movable/A, atom/OldLoc)
+	. = ..()
+	
+	var/turf/old = get_turf(OldLoc)
+	if(!isspaceturf(old) && ismob(A))
+		var/mob/M = A
+		M.update_gravity(M.mob_has_gravity())
 
 	if(destination_z && destination_x && destination_y && !(A.pulledby || !A.can_be_z_moved))
 		var/tx = destination_x
@@ -170,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