diff --git a/calendar/templates/day_detailed.mustache b/calendar/templates/day_detailed.mustache
index f27c235ac98..2148170c1fe 100644
--- a/calendar/templates/day_detailed.mustache
+++ b/calendar/templates/day_detailed.mustache
@@ -45,5 +45,9 @@
 }}>
     {{> core_calendar/day_navigation }}
     {{> core/overlay_loading}}
-    {{> core_calendar/event_list }}
+    {{< core_calendar/event_list }}
+        {{$noeventsmessage}}
+            {{#str}} daywithnoevents, core_calendar {{/str}}
+        {{/noeventsmessage}}
+    {{/core_calendar/event_list}}
 </div>
diff --git a/calendar/templates/event_list.mustache b/calendar/templates/event_list.mustache
index ae276ae2047..63e4ca91709 100644
--- a/calendar/templates/event_list.mustache
+++ b/calendar/templates/event_list.mustache
@@ -37,7 +37,7 @@
     {{/events}}
     {{^events}}
         <span class="calendar-information calendar-no-results">
-            {{#str}}daywithnoevents, calendar{{/str}}
+            {{$noeventsmessage}}{{/noeventsmessage}}
         </span>
     {{/events}}
 </div>
\ No newline at end of file
diff --git a/calendar/templates/upcoming_detailed.mustache b/calendar/templates/upcoming_detailed.mustache
index 40faee3f518..d57344f14a2 100644
--- a/calendar/templates/upcoming_detailed.mustache
+++ b/calendar/templates/upcoming_detailed.mustache
@@ -34,5 +34,9 @@
 <div class="calendarwrapper" data-view="upcoming" data-context-id="{{defaulteventcontext}}" data-courseid="{{courseid}}">
     {{> core/overlay_loading}}
         <h2 class="current text-center">{{#str}}upcomingevents, core_calendar{{/str}}</h2>
-    {{> core_calendar/event_list }}
+    {{< core_calendar/event_list }}
+        {{$noeventsmessage}}
+            {{#str}} noupcomingevents, core_calendar {{/str}}
+        {{/noeventsmessage}}
+    {{/core_calendar/event_list}}
 </div>