diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index a159cea7261..60a46407992 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -304,10 +304,8 @@
 
 	roundstart_move = "backup_away"
 
-/obj/docking_port/mobile/emergency/backup/New()
-	// We want to be a valid emergency shuttle
-	// but not be the main one, keep whatever's set
-	// valid.
+/obj/docking_port/mobile/emergency/backup/register()
+
 	var/current_emergency = shuttle_master.emergency
 	..()
 	shuttle_master.emergency = current_emergency
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 44fdc9e13f3..ffe95ff0442 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -212,15 +212,7 @@
 /obj/docking_port/mobile/New()
 	..()
 
-
-
-
-/obj/docking_port/mobile/initialize()
 	var/area/A = get_area(src)
-
-	if(!timid)
-		register()
-
 	if(istype(A, /area/shuttle))
 		areaInstance = A
 
@@ -232,6 +224,13 @@
 	#ifdef DOCKING_PORT_HIGHLIGHT
 	highlight("#0f0")
 	#endif
+
+
+
+
+/obj/docking_port/mobile/initialize()
+	if(!timid)
+		register()
 	..()
 
 /obj/docking_port/mobile/register()