diff --git a/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java b/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
index ef9acb75b5a0fa0e1a927665ead1379472e9ba03..a0538e7fdc2970bc1f8a8230223304de1f61a8d8 100644
--- a/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
+++ b/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
@@ -135,7 +135,9 @@ public class OpenMeetingsDAO {
 	}
 	
 	public void delete(OpenMeetingsRoomReference ref) {
-		dbInstance.getCurrentEntityManager().remove(ref);
+		OpenMeetingsRoomReference reloadedRef = dbInstance.getCurrentEntityManager()
+				.getReference(OpenMeetingsRoomReference.class, ref.getKey());
+		dbInstance.getCurrentEntityManager().remove(reloadedRef);
 	}
 	
 	public String serializeRoom(OpenMeetingsRoom room) {
diff --git a/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsAdminRoomsController.java b/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsAdminRoomsController.java
index 6fa1f42f1e116b441e2f0e916a10aa78e9e2d497..2b709cec0e101c53ea811c518fd3cb9c5eebff5a 100644
--- a/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsAdminRoomsController.java
+++ b/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsAdminRoomsController.java
@@ -193,7 +193,7 @@ public class OpenMeetingsAdminRoomsController extends BasicController {
 	
 	protected void confirmDelete(UserRequest ureq, OpenMeetingsRoom room) {
 		String title = translate("delete");
-		String text = translate("delete.confirm", new String[]{ room.getName() });
+		String text = translate("delete.confirm", new String[]{ StringHelper.escapeHtml(room.getName()) });
 		dialogCtr = activateOkCancelDialog(ureq, title, text, dialogCtr);
 		dialogCtr.setUserObject(room);
 	}