diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index 5bc51408b8..a8acd9492e 100755
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -928,7 +928,7 @@ function store_forum($values, $courseInfo = [], $returnId = false)
             $sql = "UPDATE $table_forums SET forum_id = iid WHERE iid = $forumId";
             Database::query($sql);
             $courseCode = $courseInfo['code'];
-            $subscribe = (int) api_get_course_setting('subscribe_users_to_forum_notifications', $courseCode);
+            $subscribe = (int) api_get_course_setting('subscribe_users_to_forum_notifications');
 
             $status = STUDENT;
             if (!empty($session_id)) {
diff --git a/main/gradebook/gradebook_display_certificate.php b/main/gradebook/gradebook_display_certificate.php
index 5c4ff8b3f3..08944f60f8 100755
--- a/main/gradebook/gradebook_display_certificate.php
+++ b/main/gradebook/gradebook_display_certificate.php
@@ -81,7 +81,7 @@ $content = '';
 $courseCode = api_get_course_id();
 
 $allowExportToZip = api_get_plugin_setting('customcertificate', 'enable_plugin_customcertificate') == 'true' &&
-    api_get_course_setting('customcertificate_course_enable', $courseCode) == 1;
+    api_get_course_setting('customcertificate_course_enable', $courseInfo) == 1;
 
 $tags = Certificate::notificationTags();
 
diff --git a/main/gradebook/lib/GradebookUtils.php b/main/gradebook/lib/GradebookUtils.php
index d02b7ad6ad..a545be3c72 100644
--- a/main/gradebook/lib/GradebookUtils.php
+++ b/main/gradebook/lib/GradebookUtils.php
@@ -1433,7 +1433,7 @@ class GradebookUtils
 
         foreach ($courses as $course) {
             if (!$includeNonPublicCertificates) {
-                $allowPublicCertificates = api_get_course_setting('allow_public_certificates', $course['code']);
+                $allowPublicCertificates = api_get_course_setting('allow_public_certificates', $course);
 
                 if (empty($allowPublicCertificates)) {
                     continue;
@@ -1505,7 +1505,7 @@ class GradebookUtils
 
             foreach ($sessionCourses as $course) {
                 if (!$includeNonPublicCertificates) {
-                    $allowPublicCertificates = api_get_course_setting('allow_public_certificates', $course['code']);
+                    $allowPublicCertificates = api_get_course_setting('allow_public_certificates');
 
                     if (empty($allowPublicCertificates)) {
                         continue;
diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php
index 19a0c53744..f255975a3e 100755
--- a/main/gradebook/lib/fe/displaygradebook.php
+++ b/main/gradebook/lib/fe/displaygradebook.php
@@ -487,7 +487,7 @@ class DisplayGradebook
                             Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).'</a>';
 
                         if (api_get_plugin_setting('customcertificate', 'enable_plugin_customcertificate') == 'true' &&
-                            api_get_course_setting('customcertificate_course_enable', $courseCode) == 1
+                            api_get_course_setting('customcertificate_course_enable') == 1
                         ) {
                             $actionsRight .= '<a href="'.api_get_path(
                                     WEB_PLUGIN_PATH
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index bd4d4b5061..584b2dc99e 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1905,16 +1905,20 @@ function api_get_course_path($course_code = null)
  * Gets a course setting from the current course_setting table. Try always using integer values.
  *
  * @param string $setting_name The name of the setting we want from the table
- * @param string $course_code
+ * @param array $course_info
  *
  * @return mixed The value of that setting in that table. Return -1 if not found.
  */
-function api_get_course_setting($setting_name, $course_code = null)
+function api_get_course_setting($setting_name, $course_info = [])
 {
-    $course_info = api_get_course_info($course_code);
-    $table = Database::get_course_table(TABLE_COURSE_SETTING);
-    $setting_name = Database::escape_string($setting_name);
-    if (!empty($course_info['real_id']) && !empty($setting_name)) {
+    if (empty($course_info)) {
+        $course_info = api_get_course_info();
+    }
+
+    if (isset($course_info['real_id']) && !empty($course_info['real_id']) && !empty($setting_name)) {
+        $table = Database::get_course_table(TABLE_COURSE_SETTING);
+        $setting_name = Database::escape_string($setting_name);
+
         $sql = "SELECT value FROM $table
                 WHERE c_id = {$course_info['real_id']} AND variable = '$setting_name'";
         $res = Database::query($sql);
@@ -2088,11 +2092,10 @@ function api_remove_in_gradebook()
  * particular course, if none given it gets the course info from the session.
  *
  * @param string $course_code
- * @param bool   $strict
  *
  * @return array
  */
-function api_get_course_info($course_code = null, $strict = false)
+function api_get_course_info($course_code = null)
 {
     if (!empty($course_code)) {
         $course_code = Database::escape_string($course_code);
@@ -5048,7 +5051,7 @@ function api_get_visual_theme()
         $course_id = api_get_course_id();
         if (!empty($course_id)) {
             if (api_get_setting('allow_course_theme') == 'true') {
-                $course_theme = api_get_course_setting('course_theme', $course_id);
+                $course_theme = api_get_course_setting('course_theme', api_get_course_info());
 
                 if (!empty($course_theme) && $course_theme != -1) {
                     if (!empty($course_theme)) {
@@ -7785,8 +7788,8 @@ function api_set_default_visibility(
         }
 
         // Read the portal and course default visibility
-        if ($tool_id == 'documents') {
-            $visibility = DocumentManager::getDocumentDefaultVisibility($courseCode);
+        if ($tool_id === 'documents') {
+            $visibility = DocumentManager::getDocumentDefaultVisibility($courseInfo);
         }
 
         api_item_property_update(
diff --git a/main/inc/lib/certificate.lib.php b/main/inc/lib/certificate.lib.php
index 2b1c3b5f84..806e0c7f04 100755
--- a/main/inc/lib/certificate.lib.php
+++ b/main/inc/lib/certificate.lib.php
@@ -604,7 +604,12 @@ class Certificate extends Model
             return false;
         }
 
-        if (api_get_course_setting('allow_public_certificates', $gradeBookInfo['course_code']) == 0) {
+        $setting = api_get_course_setting(
+            'allow_public_certificates',
+            api_get_course_info($gradeBookInfo['course_code'])
+        );
+
+        if ($setting == 0) {
             // Printing not allowed
             return false;
         }
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index eaa71529ae..6652e55169 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -715,7 +715,7 @@ class CourseManager
                     )
                 );
 
-                $send = api_get_course_setting('email_alert_to_teacher_on_new_user_in_course', $courseCode);
+                $send = api_get_course_setting('email_alert_to_teacher_on_new_user_in_course', $courseInfo);
 
                 if ($send == 1) {
                     self::email_to_tutor(
@@ -731,7 +731,7 @@ class CourseManager
                     );
                 }
 
-                $subscribe = (int) api_get_course_setting('subscribe_users_to_forum_notifications', $courseCode);
+                $subscribe = (int) api_get_course_setting('subscribe_users_to_forum_notifications', $courseInfo);
                 if ($subscribe === 1) {
                     require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
                     $forums = get_forums(0, $courseCode, true, $sessionId);
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index 271fe95856..c84a2cf5b4 100644
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -4160,11 +4160,11 @@ class DocumentManager
     }
 
     /**
-     * @param string $courseCode
+     * @param array $courseInfo
      *
      * @return string 'visible' or 'invisible' string
      */
-    public static function getDocumentDefaultVisibility($courseCode)
+    public static function getDocumentDefaultVisibility($courseInfo)
     {
         $settings = api_get_setting('tool_visible_by_default_at_creation');
         $defaultVisibility = 'visible';
@@ -4179,7 +4179,7 @@ class DocumentManager
         }
 
         if (api_get_setting('documents_default_visibility_defined_in_course') == 'true') {
-            $courseVisibility = api_get_course_setting('documents_default_visibility', $courseCode);
+            $courseVisibility = api_get_course_setting('documents_default_visibility', $courseInfo);
             if (!empty($courseVisibility) && in_array($courseVisibility, ['visible', 'invisible'])) {
                 $defaultVisibility = $courseVisibility;
             }
diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 13c59e1a93..1df7347173 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -2287,7 +2287,7 @@ class SessionManager
         $course_code = Database::escape_string($course_code);
         $courseInfo = api_get_course_info($course_code);
         $courseId = $courseInfo['real_id'];
-        $subscribe = (int) api_get_course_setting('subscribe_users_to_forum_notifications', $course_code);
+        $subscribe = (int) api_get_course_setting('subscribe_users_to_forum_notifications', $courseInfo);
         $forums = [];
         if ($subscribe === 1) {
             require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index f9697a972c..75b9a7edbf 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -3432,7 +3432,7 @@ function addWorkComment($courseInfo, $userId, $parentWork, $work, $data)
             }
         }
 
-        $sendNotification = api_get_course_setting('email_to_teachers_on_new_work_feedback', api_get_course_id());
+        $sendNotification = api_get_course_setting('email_to_teachers_on_new_work_feedback');
         if ($sendNotification != 1) {
             $userIdListToSend = [];
         }
diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php
index 4055cb0a50..2be5fdb21a 100755
--- a/plugin/bbb/lib/bbb.lib.php
+++ b/plugin/bbb/lib/bbb.lib.php
@@ -92,7 +92,7 @@ class bbb
                     // Course check
                     $courseInfo = api_get_course_info();
                     if ($courseInfo) {
-                        $this->groupSupport = api_get_course_setting('bbb_enable_conference_in_groups', $courseInfo['code']) === '1';
+                        $this->groupSupport = api_get_course_setting('bbb_enable_conference_in_groups', $courseInfo) === '1';
                     }
                 }
             }
@@ -304,7 +304,6 @@ class bbb
      */
     public function createMeeting($params)
     {
-        $courseCode = api_get_course_id();
         $params['c_id'] = api_get_course_int_id();
         $params['session_id'] = api_get_session_id();
 
@@ -321,8 +320,8 @@ class bbb
         $params['moderator_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $this->getModMeetingPassword();
         $moderatorPassword = $params['moderator_pw'];
 
-        $params['record'] = api_get_course_setting('big_blue_button_record_and_store', $courseCode) == 1 ? true : false;
-        $max = api_get_course_setting('big_blue_button_max_students_allowed', $courseCode);
+        $params['record'] = api_get_course_setting('big_blue_button_record_and_store') == 1 ? true : false;
+        $max = api_get_course_setting('big_blue_button_max_students_allowed');
         $max = isset($max) ? $max : -1;
 
         $params['status'] = 1;
diff --git a/plugin/bbb/listing.php b/plugin/bbb/listing.php
index 98609d4de2..28b1a9212b 100755
--- a/plugin/bbb/listing.php
+++ b/plugin/bbb/listing.php
@@ -133,7 +133,7 @@ if ($conferenceManager) {
             if ($plugin->get('allow_regenerate_recording') !== 'true') {
                 api_not_allowed(true);
             }
-            $allow = api_get_course_setting('bbb_force_record_generation', $courseCode) == 1 ? true : false;
+            $allow = api_get_course_setting('bbb_force_record_generation', $courseInfo) == 1 ? true : false;
             if ($allow) {
                 $result = $bbb->getMeetingByRemoteId($_GET['remote_id']);
                 if (!empty($result)) {
diff --git a/plugin/customcertificate/src/CustomCertificatePlugin.php b/plugin/customcertificate/src/CustomCertificatePlugin.php
index 63d5050306..9d83056d49 100644
--- a/plugin/customcertificate/src/CustomCertificatePlugin.php
+++ b/plugin/customcertificate/src/CustomCertificatePlugin.php
@@ -233,7 +233,7 @@ class CustomCertificatePlugin extends Plugin
             $courseCode = $row['course_code'];
             $sessionId = $row['session_id'];
             $userId = $row['user_id'];
-            if (api_get_course_setting('customcertificate_course_enable', $courseCode) == 1) {
+            if (api_get_course_setting('customcertificate_course_enable', api_get_course_info($courseCode)) == 1) {
                 return [
                     'course_code' => $courseCode,
                     'session_id' => $sessionId,
diff --git a/plugin/customcertificate/src/index.php b/plugin/customcertificate/src/index.php
index 4d16dd1cd2..7eb9cb989c 100644
--- a/plugin/customcertificate/src/index.php
+++ b/plugin/customcertificate/src/index.php
@@ -32,8 +32,8 @@ if ($isDefault === 1) {
     $courseId = api_get_course_int_id();
     $courseCode = api_get_course_id();
     $sessionId = api_get_session_id();
-    $enableCourse = api_get_course_setting('customcertificate_course_enable', $courseCode) == 1 ? true : false;
-    $useDefault = api_get_course_setting('use_certificate_default', $courseCode) == 1 ? true : false;
+    $enableCourse = api_get_course_setting('customcertificate_course_enable', $course_info) == 1 ? true : false;
+    $useDefault = api_get_course_setting('use_certificate_default', $course_info) == 1 ? true : false;
     $defaultCertificate = 0;
     $urlParams = '?'.api_get_cidreq();
 }
diff --git a/plugin/customcertificate/src/print_certificate.php b/plugin/customcertificate/src/print_certificate.php
index ace1411a3a..b0e47260fe 100644
--- a/plugin/customcertificate/src/print_certificate.php
+++ b/plugin/customcertificate/src/print_certificate.php
@@ -31,8 +31,8 @@ if ($default == 1) {
     $courseId = api_get_course_int_id();
     $courseCode = api_get_course_id();
     $sessionId = api_get_session_id();
-    $enableCourse = api_get_course_setting('customcertificate_course_enable', $courseCode) == 1 ? true : false;
-    $useDefault = api_get_course_setting('use_certificate_default', $courseCode) == 1 ? true : false;
+    $enableCourse = api_get_course_setting('customcertificate_course_enable') == 1 ? true : false;
+    $useDefault = api_get_course_setting('use_certificate_default') == 1 ? true : false;
 }
 
 if (empty($courseCode)) {