diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 02ff75ad8175..6c2e5b0c6430 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -168,7 +168,7 @@
 
 /obj/machinery/button/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
 	if(id)
-		id = "[port.shuttle_id]_[id]"
+		id = "[id]"
 		setup_device()
 
 /obj/machinery/button/attack_hand(mob/user)
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 3b0f1ee6782e..7dca32d1cfd4 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -189,4 +189,4 @@
 		. += "<span class='[span_notice("The maintenance panel is [panel_open ? "opened" : "closed"].")]"
 		
 /obj/machinery/door/poddoor/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
-	id = "[port.shuttle_id]_[id]"
+	id = "[id]"