diff --git a/main/exercise/exercise_report.php b/main/exercise/exercise_report.php
index 8ac5208bb5..5aa9db3906 100755
--- a/main/exercise/exercise_report.php
+++ b/main/exercise/exercise_report.php
@@ -265,6 +265,10 @@ if (isset($_REQUEST['comments']) &&
             WHERE exe_id = ".$id;
     Database::query($sql);
 
+    // See BT#18165
+     $objExerciseTmp->remedialCourseList($student_id,true);
+     $objExerciseTmp->advanceCourseList($student_id);
+
     if (isset($_POST['send_notification'])) {
         //@todo move this somewhere else
         $subject = get_lang('ExamSheetVCC');
diff --git a/main/exercise/exercise_result.php b/main/exercise/exercise_result.php
index 94121ef8f4..23d6484cfb 100755
--- a/main/exercise/exercise_result.php
+++ b/main/exercise/exercise_result.php
@@ -276,6 +276,10 @@ ExerciseLib::exercise_time_control_delete(
     $learnpath_id,
     $learnpath_item_id
 );
+
+// See BT#18165
+$objExercise->advanceCourseList();
+
 ExerciseLib::delete_chat_exercise_session($exeId);
 
 if (!in_array($origin, ['learnpath', 'embeddable', 'mobileapp'])) {