diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index 52e2ea03500..328becc35ce 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -494,6 +494,9 @@
 	var/list/spawn_in_storage = list()
 	to_chat(H,"<span class='notice'>You have ten minutes to reach the station before you will be forced there.</span>")
 
+	if(H.needs_wheelchair())
+		H.equip_wheelchair()
+
 	if(job)
 		//Equip custom gear loadout.
 		var/list/custom_equip_slots = list() //If more than one item takes the same slot, all after the first one spawn in storage.
diff --git a/html/changelogs/Hockaa-wheelchairs.yml b/html/changelogs/Hockaa-wheelchairs.yml
new file mode 100644
index 00000000000..ad0aaa130ab
--- /dev/null
+++ b/html/changelogs/Hockaa-wheelchairs.yml
@@ -0,0 +1,6 @@
+author: Hocka
+
+delete-after: True
+
+changes: 
+    - bugfix: "Spawned on the Odin with amputated legs or feet now spawns you in a wheelchair."