diff --git a/calendar/classes/external/calendar_day_exporter.php b/calendar/classes/external/calendar_day_exporter.php
index a0528740bf4..091dffcba9e 100644
--- a/calendar/classes/external/calendar_day_exporter.php
+++ b/calendar/classes/external/calendar_day_exporter.php
@@ -239,7 +239,7 @@ class calendar_day_exporter extends exporter {
      */
     protected function get_course_filter_selector(renderer_base $output) {
         $langstr = get_string('upcomingeventsfor', 'calendar');
-        return $output->course_filter_selector($this->url, $langstr);
+        return $output->course_filter_selector($this->url, $langstr, $this->calendar->course->id);
     }
 
     /**
diff --git a/calendar/classes/external/calendar_upcoming_exporter.php b/calendar/classes/external/calendar_upcoming_exporter.php
index 762de9862b9..ab35779aa4c 100644
--- a/calendar/classes/external/calendar_upcoming_exporter.php
+++ b/calendar/classes/external/calendar_upcoming_exporter.php
@@ -151,7 +151,7 @@ class calendar_upcoming_exporter extends exporter {
      */
     protected function get_course_filter_selector(renderer_base $output) {
         $langstr = get_string('upcomingeventsfor', 'calendar');
-        return $output->course_filter_selector($this->url, $langstr);
+        return $output->course_filter_selector($this->url, $langstr, $this->calendar->course->id);
     }
 
     /**
diff --git a/calendar/classes/external/month_exporter.php b/calendar/classes/external/month_exporter.php
index e67c8431d10..9ca253e8ae5 100644
--- a/calendar/classes/external/month_exporter.php
+++ b/calendar/classes/external/month_exporter.php
@@ -231,7 +231,8 @@ class month_exporter extends exporter {
      */
     protected function get_course_filter_selector(renderer_base $output) {
         $content = '';
-        $content .= $output->course_filter_selector($this->url, get_string('detailedmonthviewfor', 'calendar'));
+        $content .= $output->course_filter_selector($this->url, get_string('detailedmonthviewfor', 'calendar'),
+            $this->calendar->course->id);
 
         return $content;
     }
diff --git a/calendar/renderer.php b/calendar/renderer.php
index 906dbfec63b..5688e2766c2 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -237,10 +237,11 @@ class core_calendar_renderer extends plugin_renderer_base {
      *
      * @param moodle_url $returnurl The URL that the user should be taken too upon selecting a course.
      * @param string $label The label to use for the course select.
+     * @param int $courseid The id of the course to be selected.
      * @return string
      */
-    public function course_filter_selector(moodle_url $returnurl, $label=null) {
-        global $USER, $SESSION, $CFG;
+    public function course_filter_selector(moodle_url $returnurl, $label = null, $courseid = null) {
+        global $CFG;
 
         if (!isloggedin() or isguestuser()) {
             return '';
@@ -261,7 +262,9 @@ class core_calendar_renderer extends plugin_renderer_base {
             $courseoptions[$course->id] = format_string($course->shortname, true, array('context' => $coursecontext));
         }
 
-        if ($this->page->course->id !== SITEID) {
+        if ($courseid) {
+            $selected = $courseid;
+        } else if ($this->page->course->id !== SITEID) {
             $selected = $this->page->course->id;
         } else {
             $selected = '';