diff --git a/application/libraries/KalenderLib.php b/application/libraries/KalenderLib.php
index f0259338c..cad448e74 100644
--- a/application/libraries/KalenderLib.php
+++ b/application/libraries/KalenderLib.php
@@ -44,7 +44,6 @@ class KalenderLib
 				FROM lehre.tbl_kalender
 				WHERE von >= timestamp %s
 					AND bis < timestamp %s
-				limit 4000
 			)',
 			$this->_ci->KalenderModel->db->escape(date('Y-m-d H:i:s', strtotime($start_date))),
 			$this->_ci->KalenderModel->db->escape(date('Y-m-d H:i:s', strtotime($end_date)))
diff --git a/public/js/components/Calendar/Tempus.js b/public/js/components/Calendar/Tempus.js
index 40250397c..693ec6e85 100644
--- a/public/js/components/Calendar/Tempus.js
+++ b/public/js/components/Calendar/Tempus.js
@@ -17,12 +17,12 @@ export default {
 	},
 	provide() {
 		return {
-			rangeLength: 30, //Vue.computed(() => this.currentRangeLength), TODO: This is a hack to make the range mode work, but it should be fixed in the future
+			rangeLength: Vue.computed(() => this.currentRangeLength),
 			rangeViewPresets: Vue.computed(() => this.semesterRangePresets),
-			rangeViewSelectedPreset: Vue.computed({
-				get: () => this.selectedRangePreset,
-				set: value => this.selectedRangePreset = value,
-			}),
+			// rangeViewSelectedPreset: Vue.computed({
+			// 	get: () => this.selectedRangePreset,
+			// 	set: value => this.selectedRangePreset = value,
+			// }),
 		};
 	},
 	inject: {
@@ -42,7 +42,7 @@ export default {
 			}
 		},
 		rangeLength: {
-			default: 1,
+			default: 30,
 		},
 		shouldIncludeRangeMode: {
 			type: Boolean,
@@ -352,6 +352,8 @@ export default {
 				end: res.data.end,
 			};
 		});
+
+		this.fetchSemesters();
 	},
 	template: /* html */ `
 	<fhc-calendar