diff --git a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
index d3ff5eac8..27301780f 100644
--- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
@@ -51,7 +51,7 @@ namespace NzbDrone.Api.Calendar
             var episodes = _episodeService.EpisodesBetweenDates(start, end, false);
             var icalCalendar = new iCalendar();
 
-            foreach (var episode in episodes)
+            foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
             {
                 var occurrence = icalCalendar.Create<Event>();
                 occurrence.UID = "NzbDrone_episode_" + episode.Id.ToString();
diff --git a/src/NzbDrone.Api/Calendar/CalendarModule.cs b/src/NzbDrone.Api/Calendar/CalendarModule.cs
index 72960c143..c89d5f52d 100644
--- a/src/NzbDrone.Api/Calendar/CalendarModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarModule.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Api.Calendar
 
             var resources = ToListResource(() => _episodeService.EpisodesBetweenDates(start, end, includeUnmonitored));
 
-            return resources;
+            return resources.OrderBy(e => e.AirDateUtc).ToList();
         }
     }
 }
diff --git a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
index 8ffdfa405..1b18d44c8 100644
--- a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
+++ b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
@@ -79,15 +79,8 @@ namespace NzbDrone.Api.Episodes
         {
             var resources =  base.ToListResource(modelList);
 
-            var withSeries = LoadSeries(resources);
+            return LoadSeries(resources);
 
-            return withSeries.OrderByDescending(e => e.AirDateUtc.HasValue)
-                             .ThenBy(e => e.AirDateUtc.Value)
-                             .ThenBy(e => e.SeriesTitle)
-                             .ThenByDescending(e => e.SeasonNumber != 0)
-                             .ThenBy(e => e.SeasonNumber)
-                             .ThenBy(e => e.EpisodeNumber)
-                             .ToList();
         }
 
         public void Handle(EpisodeGrabbedEvent message)