diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 92b1cf999..ab7dac2b3 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -202,7 +202,7 @@ export default {
 		},
 	},
 	methods: {
-		handleChangeOffset(offset){
+		handleRangeOffset(event){
 			
 			let date = new Date(
 				this.focusDate.y,
@@ -222,7 +222,9 @@ export default {
 					focus_date: date,
 					lv_id: this.$route.params.lv_id || null
 				}
-			})
+			});
+
+			this.$emit('change:range',event);
 		},
 		setMode(mode) {
 			this.mode = mode
@@ -274,8 +276,8 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
-		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)"
-		 @input="handleInput" @change:offset="handleChangeOffset">
+		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="handleRangeOffset"
+		 @input="handleInput" >
 			<template #calendarDownloads>
 				<slot name="calendarDownloads" ></slot>
 			</template>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 2ada75802..d9b82bbcc 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -221,10 +221,7 @@ const LvPlan = {
 				// reset the events before querying the new events to activate the loading spinner
 				this.events = null;
 				this.eventCalendarDate = new CalendarDate(end);
-				Vue.nextTick(() => {
-					this.loadEvents();
-					
-				});
+				this.loadEvents();
 			}
 		},
 		calendarDateToString: function (calendarDate) {