diff --git a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
index 27301780f..d3ff5eac8 100644
--- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
@@ -51,7 +51,7 @@ private Response GetCalendarFeed()
             var episodes = _episodeService.EpisodesBetweenDates(start, end, false);
             var icalCalendar = new iCalendar();
 
-            foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
+            foreach (var episode in episodes)
             {
                 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 c89d5f52d..72960c143 100644
--- a/src/NzbDrone.Api/Calendar/CalendarModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarModule.cs
@@ -35,7 +35,7 @@ private List<EpisodeResource> GetCalendar()
 
             var resources = ToListResource(() => _episodeService.EpisodesBetweenDates(start, end, includeUnmonitored));
 
-            return resources.OrderBy(e => e.AirDateUtc).ToList();
+            return resources;
         }
     }
 }
diff --git a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
index 1b18d44c8..8ffdfa405 100644
--- a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
+++ b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
@@ -79,8 +79,15 @@ protected override List<EpisodeResource> ToListResource<TModel>(IEnumerable<TMod
         {
             var resources =  base.ToListResource(modelList);
 
-            return LoadSeries(resources);
+            var withSeries = 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)