diff --git a/code/datums/elements/elevation.dm b/code/datums/elements/elevation.dm
index b83548c6b5f..959fa14f798 100644
--- a/code/datums/elements/elevation.dm
+++ b/code/datums/elements/elevation.dm
@@ -151,8 +151,8 @@
 
 /datum/element/elevation_core/proc/on_initialized_on(turf/source, atom/movable/spawned)
 	SIGNAL_HANDLER
-	if(isliving(spawned))
-		elevate_mob(spawned)
+	if(isliving(spawned) && !HAS_TRAIT(spawned, TRAIT_ON_ELEVATED_SURFACE))
+		on_entered(entered = spawned)
 
 /datum/element/elevation_core/proc/on_exited(turf/source, atom/movable/gone)
 	SIGNAL_HANDLER