diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index c605c01c459fd06dd840756cf5d6f3c9197d4aa1..85b5b433dc215d146dd4fb4ec93cb2e5df34afe8 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -660,7 +660,7 @@ class Calendar_CalendarController extends AuthenticatedController
     public function add_courses_action()
     {
         $selected_semester_pseudo_id = Request::option('semester_id');
-        $this->selected_semesters_id = '';
+        $this->selected_semester_id = '';
         $this->available_semester_data = [];
         $semesters = Semester::getAll();
         foreach ($semesters as $semester) {
@@ -691,8 +691,9 @@ class Calendar_CalendarController extends AuthenticatedController
             $this->selected_semester_id = $semester->id;
         } else {
             $this->selected_semester_id = $selected_semester_pseudo_id ?? '';
-            if (!Semester::exists($this->selected_semesters_id)) {
-                $this->selected_semester_id = '';
+            if (!Semester::exists($this->selected_semester_id)) {
+                $semester = Semester::findCurrent();
+                $this->selected_semester_id = $semester->id;
             }
         }