diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 4b0501a2d1..1f2025ca07 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -78,8 +78,8 @@
 	else
 		return ..()
 
-/obj/structure/proc/can_climb(var/mob/living/user)
-	if (!can_touch(user) || !climbable || (user in climbers))
+/obj/structure/proc/can_climb(var/mob/living/user, post_climb_check=0)
+	if (!can_touch(user) || !climbable || (!post_climb_check && (user in climbers)))
 		return 0
 
 	if (!user.Adjacent(src))
@@ -115,7 +115,7 @@
 		climbers -= user
 		return
 
-	if (!can_climb(user))
+	if (!can_climb(user, post_climb_check=1))
 		climbers -= user
 		return