diff --git a/main/inc/ajax/agenda.ajax.php b/main/inc/ajax/agenda.ajax.php
index 3a3c3c1500..af3b2afb70 100755
--- a/main/inc/ajax/agenda.ajax.php
+++ b/main/inc/ajax/agenda.ajax.php
@@ -20,7 +20,6 @@ if ($type == 'course') {
 }
 
 $group_id = api_get_group_id();
-
 $is_group_tutor = GroupManager::is_tutor_of_group(api_get_user_id(), $group_id);
 
 $agenda = new Agenda();
@@ -34,6 +33,11 @@ switch ($action) {
         $add_as_announcement = isset($_REQUEST['add_as_annonuncement']) ? $_REQUEST['add_as_annonuncement'] : null;
         $comment = isset($_REQUEST['comment']) ? $_REQUEST['comment'] : null;
         $userToSend = isset($_REQUEST['users_to_send']) ? $_REQUEST['users_to_send'] : array();
+
+        if ($type === 'course') {
+            $agenda->set_course(api_get_course_info());
+        }
+
         echo $agenda->addEvent(
             $_REQUEST['start'],
             $_REQUEST['end'],
diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index 481aeb310d..4c958fdb10 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -27,14 +27,13 @@ class Agenda
      */
     public function __construct($senderId = 0, $courseId = 0, $sessionId = 0)
     {
-        //Table definitions
+        // Table definitions
         $this->tbl_global_agenda = Database::get_main_table(TABLE_MAIN_SYSTEM_CALENDAR);
         $this->tbl_personal_agenda = Database::get_main_table(TABLE_PERSONAL_AGENDA);
         $this->tbl_course_agenda = Database::get_course_table(TABLE_AGENDA);
         $this->table_repeat = Database::get_course_table(TABLE_AGENDA_REPEAT);
 
-        //Setting the course object if we are in a course
-        unset($this->course);
+        // Setting the course object if we are in a course
         $courseInfo = api_get_course_info_by_id($courseId);
         if (!empty($courseInfo)) {
             $this->course = $courseInfo;