diff --git a/code/modules/heavy_vehicle/mech_life.dm b/code/modules/heavy_vehicle/mech_life.dm
index 6ea1ee6ba7f..12bc25963e0 100644
--- a/code/modules/heavy_vehicle/mech_life.dm
+++ b/code/modules/heavy_vehicle/mech_life.dm
@@ -75,7 +75,6 @@
 			visible_message("<span class='danger'>\The [src]'s hull bends and buckles under the intense heat!</span>")
 
 /mob/living/heavy_vehicle/death(var/gibbed)
-
 	// Salvage moves into the wreck unless we're exploding violently.
 	var/obj/wreck = new wreckage_path(get_turf(src), src, gibbed)
 	wreck.name = "wreckage of \the [name]"
@@ -94,12 +93,16 @@
 	// Eject the pilot.
 	if(LAZYLEN(pilots))
 		hatch_locked = 0 // So they can get out.
-		for(var/pilot in pilots)
+		for(var/mob/pilot in pilots)
+			pilot.body_return()
 			eject(pilot, silent=1)
+			if(remote_network && istype(pilot, /mob/living/simple_animal/spiderbot))
+				gib(pilot)
 
 	// Handle the rest of things.
 	..(gibbed, (gibbed ? "explodes!" : "grinds to a halt before collapsing!"))
-	if(!gibbed) qdel(src)
+	if(!gibbed)
+		qdel(src)
 
 /mob/living/heavy_vehicle/gib()
 	death(1)
diff --git a/html/changelogs/geeves-mecha_die.yml b/html/changelogs/geeves-mecha_die.yml
new file mode 100644
index 00000000000..2516d7511f4
--- /dev/null
+++ b/html/changelogs/geeves-mecha_die.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - bugfix: "Having your mech explode while you're remotely piloting it should no longer kill you. Probably."
\ No newline at end of file