2 files changed, 2 insertions, 5 deletions
diff --git a/src/Enmarcha.Backend/Controllers/ArrivalsController.cs b/src/Enmarcha.Backend/Controllers/ArrivalsController.cs
index b93b3c9..5c64efa 100644
--- a/src/Enmarcha.Backend/Controllers/ArrivalsController.cs
+++ b/src/Enmarcha.Backend/Controllers/ArrivalsController.cs
@@ -157,10 +157,7 @@ public partial class ArrivalsController : ControllerBase
                 Longitude = stop.Lon
             },
             Routes = [.. stop.Routes
-                .OrderBy(
-                    r => r.ShortName,
-                    Comparer<string?>.Create(SortingHelper.SortRouteShortNames)
-                )
+                .OrderBy(r => SortingHelper.GetRouteSortKey(r.ShortName, r.GtfsId))
                 .Select(r => new RouteInfo
                 {
                     GtfsId = r.GtfsId,
diff --git a/src/Enmarcha.Backend/Controllers/TransitController.cs b/src/Enmarcha.Backend/Controllers/TransitController.cs
index 93129f9..a70f46e 100644
--- a/src/Enmarcha.Backend/Controllers/TransitController.cs
+++ b/src/Enmarcha.Backend/Controllers/TransitController.cs
@@ -68,7 +68,7 @@ public class TransitController : ControllerBase
 
             var routes = response.Data.Routes
                 .Select(_otpService.MapRoute)
-                .OrderBy(r => r.ShortName, Comparer<string?>.Create(SortingHelper.SortRouteShortNames))
+                .OrderBy(r => SortingHelper.GetRouteSortKey(r.ShortName, r.Id))
                 .ToList();
 
             _cache.Set(cacheKey, routes, TimeSpan.FromHours(1));