diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index a575e4fb00..206a5e25a9 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -5229,7 +5229,17 @@ class Exercise
         $subject = get_lang('ExerciseAttempted');
 
         if (!empty($sessionId)) {
-            $teachers = CourseManager::get_coach_list_from_course_code($courseCode, $sessionId);
+            $addGeneralCoach = true;
+            $setting = api_get_configuration_value('block_quiz_mail_notification_general_coach');
+            if ($setting === true) {
+                $addGeneralCoach = false;
+            }
+
+            $teachers = CourseManager::get_coach_list_from_course_code(
+                $courseCode,
+                $sessionId,
+                $addGeneralCoach
+            );
         } else {
             $teachers = CourseManager::get_teacher_list_from_course_code($courseCode);
         }
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 4d9a3d4c29..1a54677a35 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -1665,9 +1665,10 @@ class CourseManager
      * Get a list of coaches of a course and a session
      * @param   string  Course code
      * @param   int     Session ID
+     * @param bool $addGeneralCoach
      * @return  array   List of users
      */
-    public static function get_coach_list_from_course_code($course_code, $session_id)
+    public static function get_coach_list_from_course_code($course_code, $session_id, $addGeneralCoach = true)
     {
         if (empty($course_code) OR empty($session_id)) {
             return array();
@@ -1692,16 +1693,18 @@ class CourseManager
             $users[$user['user_id']] = $user_info;
         }
 
-        $table = Database::get_main_table(TABLE_MAIN_SESSION);
-        // We get the session coach.
-        $sql = 'SELECT id_coach FROM ' . $table . ' WHERE id=' . $session_id;
-        $rs = Database::query($sql);
-        $session_id_coach = Database::result($rs, 0, 'id_coach');
-        $user_info = api_get_user_info($session_id_coach);
-        $user_info['status'] = $user['status'];
-        //$user_info['tutor_id'] = $user['tutor_id'];
-        $user_info['email'] = $user['email'];
-        $users[$session_id_coach] = $user_info;
+        if ($addGeneralCoach) {
+            $table = Database::get_main_table(TABLE_MAIN_SESSION);
+            // We get the session coach.
+            $sql = 'SELECT id_coach FROM '.$table.' WHERE id='.$session_id;
+            $rs = Database::query($sql);
+            $session_id_coach = Database::result($rs, 0, 'id_coach');
+            $user_info = api_get_user_info($session_id_coach);
+            $user_info['status'] = $user['status'];
+            //$user_info['tutor_id'] = $user['tutor_id'];
+            $user_info['email'] = $user['email'];
+            $users[$session_id_coach] = $user_info;
+        }
 
         return $users;
     }