diff --git a/code/modules/shuttle/computers/trijent_elevator_control.dm b/code/modules/shuttle/computers/trijent_elevator_control.dm
index 5da0f4f8f2..41c3456a1f 100644
--- a/code/modules/shuttle/computers/trijent_elevator_control.dm
+++ b/code/modules/shuttle/computers/trijent_elevator_control.dm
@@ -43,9 +43,9 @@
 
 /obj/structure/machinery/computer/shuttle/elevator_controller/proc/get_landing_zones()
 	. = list()
-	var/obj/docking_port/mobile/shuttle = SSshuttle.getShuttle(shuttleId)
+	var/obj/docking_port/mobile/trijent_elevator/shuttle = SSshuttle.getShuttle(shuttleId)
 
-	for(var/obj/docking_port/stationary/elev in SSshuttle.stationary)
+	for(var/obj/docking_port/stationary/trijent_elevator/elev in SSshuttle.stationary)
 		if(!shuttle.elevator_network)
 			. += list(elev)
 			continue
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 00ba9aea3e..b064d35239 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -206,7 +206,6 @@
 
 	var/datum/map_template/shuttle/roundstart_template
 	var/json_key
-	var/elevator_network
 
 /obj/docking_port/stationary/register(replace = FALSE)
 	. = ..()
diff --git a/code/modules/shuttle/shuttles/trijent_elevator.dm b/code/modules/shuttle/shuttles/trijent_elevator.dm
index e34484b02e..4e0e7fbced 100644
--- a/code/modules/shuttle/shuttles/trijent_elevator.dm
+++ b/code/modules/shuttle/shuttles/trijent_elevator.dm
@@ -19,6 +19,7 @@
 
 	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
 	var/datum/door_controller/aggregate/door_control
+	var/elevator_network
 
 /obj/docking_port/mobile/trijent_elevator/Initialize(mapload, ...)
 	. = ..()
@@ -45,6 +46,7 @@
 	// shutters to clear the area
 	var/airlock_area
 	var/airlock_exit
+	var/elevator_network
 
 /obj/docking_port/stationary/trijent_elevator/proc/get_doors()
 	. = list()