diff --git a/JavaSource/org/unitime/timetable/gwt/client/events/EventRoomAvailability.java b/JavaSource/org/unitime/timetable/gwt/client/events/EventRoomAvailability.java
index b4c53ba9e9..eb483519e4 100644
--- a/JavaSource/org/unitime/timetable/gwt/client/events/EventRoomAvailability.java
+++ b/JavaSource/org/unitime/timetable/gwt/client/events/EventRoomAvailability.java
@@ -876,6 +876,14 @@ public int compare(EventInterface e1, EventInterface e2) {
 	}
 	
 	private void populate(List<EventInterface> result, Integer sortBy) {
+		int nrMeetings = 0;
+		for (EventInterface event: result)
+			nrMeetings += event.getMeetings().size();
+		if (nrMeetings > CONSTANTS.maxMeetings())
+			iHeader.setErrorMessage(MESSAGES.warnTooManyMeetings(CONSTANTS.maxMeetings()));
+		else
+			iHeader.clearMessage();
+		
 		for (int i = 0; i < iTables.getWidgetCount(); i++) {
 			Widget w = iTables.getWidget(i);
 			if (w instanceof TimeGrid)
diff --git a/WebContent/help/Release-Notes.xml b/WebContent/help/Release-Notes.xml
index b6ddc9bcd6..73b74b111c 100644
--- a/WebContent/help/Release-Notes.xml
+++ b/WebContent/help/Release-Notes.xml
@@ -86,6 +86,16 @@
 			</description>
 		</item>
 	</category>
+	<category>
+		<title>Event Management</title>
+		<item>
+			<name>Event Room Availability: Too Many Meetings Warning</name>
+			<description>
+				<line>When the search results in more than 10000 meetings a warning is shown (as the query is limited to 10001 records).</line>
+				<line>This is the same warning as on the Events page.</line>
+			</description>
+		</item>
+	</category>	
 	<category>
 		<title>Administration</title>
 		<item>