diff --git a/economy.c b/economy.c
index 2d0f17b7bb..486b8ea788 100644
--- a/economy.c
+++ b/economy.c
@@ -1347,6 +1347,9 @@ int LoadUnloadVehicle(Vehicle *v)
 
 	v->cur_speed = 0;
 
+	old_player = _current_player;
+	_current_player = v->owner;
+
 	st = GetStation(last_visited = v->last_station_visited);
 
 	for (; v != NULL; v = v->next) {
@@ -1453,9 +1456,6 @@ int LoadUnloadVehicle(Vehicle *v)
 		TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY);
 	}
 
-	old_player = _current_player;
-	_current_player = v->owner;
-
 	if (result != 0) {
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);