diff --git a/src/economy.cpp b/src/economy.cpp
index 2736ef23d7..77dd93109e 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1095,9 +1095,6 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 {
 	assert(v->current_order.IsType(OT_LOADING));
 
-	/* When we've finished loading we're just staying here till the timetable 'runs' out */
-	if (HasBit(v->vehicle_flags, VF_LOADING_FINISHED)) return;
-
 	assert(v->load_unload_time_rem != 0);
 
 	/* We have not waited enough time till the next round of loading/unloading */
@@ -1119,6 +1116,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 		/* The train reversed in the station. Take the "easy" way
 		 * out and let the train just leave as it always did. */
 		SetBit(v->vehicle_flags, VF_LOADING_FINISHED);
+		v->load_unload_time_rem = 1;
 		return;
 	}