diff --git a/CHANGELOG.md b/CHANGELOG.md
index 380ab383..39b24d30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Updated
 
+### Fixed
+- Fixed issue with calendar module showing more than `maximumEntries` allows
+
 ## [2.1.3] - 2017-10-01
 
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index ad3be8ce..6e629997 100644
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -356,7 +356,7 @@ Module.register("calendar", {
 			return a.startDate - b.startDate;
 		});
 
-		return events;
+		return events.slice(0, this.config.maximumEntries);
 	},
 
 	/* createEventList(url)