diff --git a/src/api/client/message.rs b/src/api/client/message.rs
index 571a238a..c755cc47 100644
--- a/src/api/client/message.rs
+++ b/src/api/client/message.rs
@@ -1,6 +1,6 @@
 use axum::extract::State;
 use conduwuit::{
-	Event, PduCount, PduEvent, Result, at,
+	Err, Event, PduCount, PduEvent, Result, at,
 	utils::{
 		IterStream, ReadyExt,
 		result::{FlatOk, LogErr},
@@ -68,6 +68,10 @@ pub(crate) async fn get_message_events_route(
 	let room_id = &body.room_id;
 	let filter = &body.filter;
 
+	if !services.rooms.metadata.exists(room_id).await {
+		return Err!(Request(Forbidden("Room does not exist to this server")));
+	}
+
 	let from: PduCount = body
 		.from
 		.as_deref()