diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm
index b400017f603..20728cda932 100644
--- a/code/modules/shuttles/shuttle_console.dm
+++ b/code/modules/shuttles/shuttle_console.dm
@@ -40,6 +40,11 @@
 	..(departing, destination, interim, travel_time)
 
 /datum/shuttle/ferry/move(var/area/origin,var/area/destination)
+	if(!destination)
+		destination = (location == 1 ? area_station : area_offsite)
+	if(!origin)
+		origin = (location == 1 ? area_offsite : area_station)
+
 	if (docking_controller && !docking_controller.undocked())
 		docking_controller.force_undock()
 	..(origin, destination)