Integrating a diversified dispute resolution mechanism into civil and commercial aviation dispute resolution has become an emerging trend, aiming to allow the disputing parties to have access to all available dispute resolution alternatives in a convenient, efficient and cost-effective manner. In China, the most recent development regarding the integration of a diversified dispute resolution mechanism that combines arbitration, mediation and litigation specific to aviation disputes, as evidenced by the creation of the first One-Stop Aviation Dispute Resolution Platform (hereinafter ‘One-Stop Aviation DRP’) in Shanghai on 18 May 2023. This ‘three-in-one’ platform is formed by the Shanghai International Aviation Court of Arbitration (SIACA) established in 2014, the Mediation Centre for Aviation Disputes established in 2020, and the Adjudication Station for Aviation Cases – a unique court branch – established in 2023. This article introduces the One-Stop Aviation DRP, explains the recent development of the three aviation-specific dispute resolution institutions thereunder, and proposes to use Online Dispute Resolution (ODR) as a feasible tool for constructing the One-Stop Aviation DRP in the near future.