diff --git a/js/calendar/calendar.js b/js/calendar/calendar.js
index ae230033..bedb0729 100644
--- a/js/calendar/calendar.js
+++ b/js/calendar/calendar.js
@@ -16,9 +16,6 @@ calendar.updateData = function (callback) {
 		this.eventList = [];
 
 		for (var i in events) {
-			if (this.eventList.length >= calendar.maximumEntries) {
-				break;
-			}
 
 			var e = events[i];
 			for (var key in e) {
@@ -94,6 +91,9 @@ calendar.updateData = function (callback) {
 
 		this.eventList = this.eventList.sort(function(a,b){return a.seconds-b.seconds});
 
+		// Limit the number of entries.
+		this.eventList = this.eventList.slice(0, calendar.maximumEntries);
+
 		if (callback !== undefined && Object.prototype.toString.call(callback) === '[object Function]') {
 			callback(this.eventList);
 		}
@@ -134,4 +134,4 @@ calendar.init = function () {
 		this.updateData(this.updateCalendar.bind(this));
 	}.bind(this), this.updateDataInterval);
 
-}
\ No newline at end of file
+}