index 37fca710b17..fd8de4bcfc3 100644
--- a/calendar/amd/src/view_manager.js
+++ b/calendar/amd/src/view_manager.js
@@ -235,7 +235,9 @@ export const reloadCurrentMonth = (root, courseId = 0, categoryId = 0) => {
 export const refreshDayContent = (root, year, month, day, courseId, categoryId, target = null, template = '') => {
     startLoading(root);
 
-    target = target || root.find(CalendarSelectors.wrapper);
+    if (!target || target.length == 0){
+        target = root.find(CalendarSelectors.calendarMain);
+    }
     template = template || root.attr('data-template');
     M.util.js_pending([root.get('id'), year, month, day, courseId, categoryId].join('-'));
     const includenavigation = root.data('includenavigation');
@@ -245,7 +247,7 @@ export const refreshDayContent = (root, year, month, day, courseId, categoryId,
             return Templates.render(template, context);
         })
         .then((html, js) => {
-            return Templates.replaceNode(target, html, js);
+            return Templates.replaceNodeContents(target, html, js);
         })
         .then(() => {
             document.querySelector('body').dispatchEvent(new CustomEvent(CalendarEvents.viewUpdated));
[dev@graham-vm-rhel8moodle-dev moodle]$ git diff MOODLE_310_STABLE..MOOD-107_calendar -- calendar/amd/src/
diff --git a/calendar/amd/src/calendar.js b/calendar/amd/src/calendar.js
index 96c0b087b5f..1b99e6a0e95 100644
--- a/calendar/amd/src/calendar.js
+++ b/calendar/amd/src/calendar.js
@@ -179,9 +179,10 @@ define([
                 month = dayLink.data('month'),
                 day = dayLink.data('day'),
                 courseId = dayLink.data('courseid'),
-                categoryId = dayLink.data('categoryid');
-            CalendarViewManager.refreshDayContent(root, year, month, day, courseId, categoryId, root,
-                    'core_calendar/calendar_day').then(function() {
+                categoryId = dayLink.data('categoryid'),
+                calendarMain = $(CalendarSelectors.calendarMain);
+            CalendarViewManager.refreshDayContent(calendarMain, year, month, day, courseId, categoryId, 
+                    calendarMain, 'core_calendar/calendar_day').then(function() {
                 e.preventDefault();
                 var url = '?view=day&time=' + dayLink.data('timestamp');
                 return window.history.pushState({}, '', url);
diff --git a/calendar/amd/src/view_manager.js b/calendar/amd/src/view_manager.js
index 37fca710b17..fd8de4bcfc3 100644
--- a/calendar/amd/src/view_manager.js
+++ b/calendar/amd/src/view_manager.js
@@ -235,7 +235,9 @@ export const reloadCurrentMonth = (root, courseId = 0, categoryId = 0) => {
 export const refreshDayContent = (root, year, month, day, courseId, categoryId, target = null, template = '') => {
     startLoading(root);
 
-    target = target || root.find(CalendarSelectors.wrapper);
+    if (!target || target.length == 0){
+        target = root.find(CalendarSelectors.calendarMain);
+    }
     template = template || root.attr('data-template');
     M.util.js_pending([root.get('id'), year, month, day, courseId, categoryId].join('-'));
     const includenavigation = root.data('includenavigation');
@@ -245,7 +247,7 @@ export const refreshDayContent = (root, year, month, day, courseId, categoryId,
             return Templates.render(template, context);
         })
         .then((html, js) => {
-            return Templates.replaceNode(target, html, js);
+            return Templates.replaceNodeContents(target, html, js);
         })
         .then(() => {
             document.querySelector('body').dispatchEvent(new CustomEvent(CalendarEvents.viewUpdated));