diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonGuestJoinController.java b/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonGuestJoinController.java
index a005cf6b2836e25b4653c58f24306d47d3ad91a0..8f61b7b0e553e224e74258a259d18851fa5204b9 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonGuestJoinController.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonGuestJoinController.java
@@ -122,8 +122,12 @@ public class BigBlueButtonGuestJoinController extends FormBasicController implem
 				&& !Boolean.TRUE.equals(ureq.getUserSession().getEntry("meeting-" + meeting.getKey()))) {
 			FormLayoutContainer layoutCont = (FormLayoutContainer)formLayout;
 			layoutCont.contextPut("title", meeting.getName());
-			if(StringHelper.containsNonWhitespace(meeting.getDescription())) {
-				layoutCont.contextPut("description", meeting.getDescription());
+			String descr = meeting.getDescription();
+			if(StringHelper.containsNonWhitespace(descr)) {
+				if(!StringHelper.isHtml(descr)) {
+					descr = Formatter.escWithBR(descr).toString();
+				}
+				layoutCont.contextPut("description", descr);
 			}
 			if(meeting.getStartDate() != null) {
 				String start = Formatter.getInstance(getLocale()).formatDateAndTime(meeting.getStartDate());
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java b/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java
index d0936135988c2f8ed407703fe0e725cc6b62f316..1ff808d6935d8e024a31d699d088a5ac06a429d9 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java
@@ -141,8 +141,12 @@ public class BigBlueButtonMeetingController extends FormBasicController implemen
 		if(formLayout instanceof FormLayoutContainer) {
 			FormLayoutContainer layoutCont = (FormLayoutContainer)formLayout;
 			layoutCont.contextPut("title", meeting.getName());
-			if(StringHelper.containsNonWhitespace(meeting.getDescription())) {
-				layoutCont.contextPut("description", meeting.getDescription());
+			String descr = meeting.getDescription();
+			if(StringHelper.containsNonWhitespace(descr)) {
+				if(!StringHelper.isHtml(descr)) {
+					descr = Formatter.escWithBR(descr).toString();
+				}
+				layoutCont.contextPut("description", descr);
 			}
 			if(meeting.getStartDate() != null) {
 				String start = Formatter.getInstance(getLocale()).formatDateAndTime(meeting.getStartDate());