diff --git a/train_cmd.c b/train_cmd.c
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -2156,7 +2156,7 @@ static bool ProcessTrainOrder(Vehicle *v
 	}
 
 	if (v->current_order.type == OT_GOTO_DEPOT &&
-			(v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) ==  (OF_UNLOAD | OF_FULL_LOAD) &&
+			(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) ==  (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
 			!VehicleNeedsService(v)) {
 		v->cur_order_index++;
 	}