diff --git a/course/lib.php b/course/lib.php
index c12f46f120f..1d9265d3c3e 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -4801,6 +4801,12 @@ function course_get_communication_instance_data(int $courseid): array {
  */
 function course_update_communication_instance_data(stdClass $data): void {
     $data->id = $data->instanceid; // For correct use in update_course.
+    // If the room name is set to empty, then set it course name.
+    $provider = $data->selectedcommunication ?? null;
+    $roomnameidentifier = $provider . 'roomname';
+    if ($provider && empty($data->$roomnameidentifier)) {
+        $data->$roomnameidentifier = $data->fullname ?? get_course($data->id)->fullname;
+    }
     core_communication\helper::update_course_communication_instance(
         course: $data,
         changesincoursecat: false,