diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php
index e7171733753..0d6fc79c132 100644
--- a/blocks/calendar_upcoming/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/block_calendar_upcoming.php
@@ -78,5 +78,3 @@ class block_calendar_upcoming extends block_base {
         return $this->content;
     }
 }
-
-
diff --git a/calendar/lib.php b/calendar/lib.php
index 8c20f9a34c0..b4b0c2c1a8d 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -3220,7 +3220,7 @@ function calendar_get_view(\calendar_information $calendar, $view, $includenavig
         if ($view == "upcoming") {
             $template = 'core_calendar/calendar_upcoming';
         } else if ($view == "upcoming_mini") {
-            $template = 'core_calendar/upcoming_mini';
+            $template = 'core_calendar/calendar_upcoming_mini';
         }
     }
 
diff --git a/calendar/templates/calendar_upcoming_mini.mustache b/calendar/templates/calendar_upcoming_mini.mustache
new file mode 100644
index 00000000000..8f276be1762
--- /dev/null
+++ b/calendar/templates/calendar_upcoming_mini.mustache
@@ -0,0 +1,41 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_calendar/calendar_upcoming_block
+
+    Calendar upcoming view.
+
+    The purpose of this template is to render the calendar upcoming view.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * none
+
+    Example context (json):
+    {
+    }
+}}
+<div id="calendar-upcoming-block-{{uniqid}}" data-template="core_calendar/upcoming_mini">
+    {{> core_calendar/upcoming_mini}}
+</div>
+{{#js}}
+require(['jquery', 'core_calendar/calendar_view'], function($, CalendarView) {
+    CalendarView.init($("#calendar-upcoming-block-{{uniqid}}"), 'upcoming');
+});
+{{/js}}