diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 78eaa4d13b..87f86c5df9 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -197,6 +197,8 @@
 
 	QDEL_NULL(proximity_monitor)
 	QDEL_NULL(language_holder)
+	
+	unbuckle_all_mobs(force=1)
 
 	. = ..()
 	if(loc)
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 0034a7e6df..0648300147 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -26,11 +26,6 @@
 		if(user_buckle_mob(M, user))
 			return 1
 
-//Cleanup
-/atom/movable/Destroy()
-	. = ..()
-	unbuckle_all_mobs(force=1)
-
 /atom/movable/proc/has_buckled_mobs()
 	if(!buckled_mobs)
 		return FALSE