diff --git a/UI/Calendar/CalendarCollection.js b/UI/Calendar/CalendarCollection.js
index b1daaf248..3309dde8c 100644
--- a/UI/Calendar/CalendarCollection.js
+++ b/UI/Calendar/CalendarCollection.js
@@ -3,8 +3,11 @@ define(['app', 'Series/EpisodeModel'], function () {
     NzbDrone.Calendar.CalendarCollection = Backbone.Collection.extend({
         url       : NzbDrone.Constants.ApiRoot + '/calendar',
         model     : NzbDrone.Series.EpisodeModel,
-        comparator: function (model) {
-            return model.get('airDate');
+
+        comparator: function(model) {
+            var date = new Date(model.get('airDate'));
+            var time = date.getTime();
+            return time;
         }
     });
 });
\ No newline at end of file
diff --git a/UI/Series/SeriesCollection.js b/UI/Series/SeriesCollection.js
index 78df7bba8..cec7fadc0 100644
--- a/UI/Series/SeriesCollection.js
+++ b/UI/Series/SeriesCollection.js
@@ -4,17 +4,13 @@ define(['app', 'Series/SeriesModel'], function () {
         url  : NzbDrone.Constants.ApiRoot + '/series',
         model: NzbDrone.Series.SeriesModel,
 
-        mode: 'client',
+        comparator: function(model) {
+            return model.get('title');
+        },
 
         state: {
             sortKey: "title",
-            order: -1,
-            pageSize: 1000000
-        },
-
-        queryParams: {
-            sortKey: null,
-            order: null
+            order: -1
         }
     });
 });