diff --git a/main/admin/course_list.php b/main/admin/course_list.php
index 09514c8e05..4ac1bdfcde 100755
--- a/main/admin/course_list.php
+++ b/main/admin/course_list.php
@@ -342,6 +342,8 @@ if (isset($_POST['action'])) {
                     $obj_cat->update_category_delete($course_code);
                 }
             }
+
+            Display::addFlash(Display::return_message(get_lang('Deleted')));
             break;
     }
 }
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 230b6520ae..4e2631c417 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -2314,9 +2314,15 @@ class CourseManager
             // Skills
             $table = Database::get_main_table(TABLE_MAIN_SKILL_REL_USER);
             $argumentation = Database::escape_string(sprintf(get_lang('SkillFromCourseXDeletedSinceThen'), $course['code']));
-            $sql = "UPDATE $table SET course_id = NULL, session_id = NULL, argumentation = '$argumentation' WHERE course_id = $courseId";
+            $sql = "UPDATE $table SET course_id = NULL, session_id = NULL, argumentation = '$argumentation' 
+                    WHERE course_id = $courseId";
             Database::query($sql);
 
+            if (api_get_configuration_value('allow_skill_rel_items')) {
+                $sql = "DELETE FROM skill_rel_course WHERE c_id = $courseId";
+                Database::query($sql);
+            }
+
             // Deletes all groups, group-users, group-tutors information
             // To prevent fK mix up on some tables
             GroupManager::deleteAllGroupsFromCourse($courseId);