diff --git a/blocks/calendar_month/block_calendar_month.php b/blocks/calendar_month/block_calendar_month.php
index 4e1bc3e3193..657fe42e698 100644
--- a/blocks/calendar_month/block_calendar_month.php
+++ b/blocks/calendar_month/block_calendar_month.php
@@ -48,8 +48,8 @@ class block_calendar_month extends block_base {
         $this->content->text = '';
         $this->content->footer = '';
 
-        $courseid = isset($this->page->course) ? $this->page->course->id : SITEID;
-        $categoryid = isset($this->page->category) ? $this->page->category->id : null;
+        $courseid = $this->page->course->id;
+        $categoryid = ($this->page->context->contextlevel === CONTEXT_COURSECAT) ? $this->page->category->id : null;
         $calendar = \calendar_information::create(time(), $courseid, $categoryid);
         list($data, $template) = calendar_get_view($calendar, 'mini');
 
diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php
index 5abdbafd9cc..6ae9c7ff01f 100644
--- a/blocks/calendar_upcoming/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/block_calendar_upcoming.php
@@ -47,8 +47,8 @@ class block_calendar_upcoming extends block_base {
         $this->content->text = '';
         $this->content->footer = '';
 
-        $courseid = isset($this->page->course) ? $this->page->course->id : SITEID;
-        $categoryid = isset($this->page->category) ? $this->page->category->id : null;
+        $courseid = $this->page->course->id;
+        $categoryid = ($this->page->context->contextlevel === CONTEXT_COURSECAT) ? $this->page->category->id : null;
         $calendar = \calendar_information::create(time(), $courseid, $categoryid);
         list($data, $template) = calendar_get_view($calendar, 'upcoming_mini');