1 files changed, 7 insertions, 0 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index e3ffbbc91..f4f38bd9c 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -1919,6 +1919,13 @@ void Vehicle::HandleLoading(bool mode)
 
 			this->LeaveStation();
 
+			/* Only advance to next order if we just loaded at the current one */
+			const Order *order = this->GetOrder(this->cur_auto_order_index);
+			if (order == NULL ||
+					(!order->IsType(OT_AUTOMATIC) && !order->IsType(OT_GOTO_STATION)) ||
+					order->GetDestination() != this->last_station_visited) {
+				return;
+			}
 			break;
 		}