diff --git a/modules/client/rooms/messages.cc b/modules/client/rooms/messages.cc
index 3ca1cce67..1fb9c13c5 100644
--- a/modules/client/rooms/messages.cc
+++ b/modules/client/rooms/messages.cc
@@ -115,15 +115,6 @@ get__messages(client &client,
 		out
 	};
 
-	// Spec sez the 'from' token is exclusive
-	if(page.from && it)
-	{
-		if(page.dir == 'b')
-			--it;
-		else
-			++it;
-	}
-
 	m::event::id::buf start
 	{
 		page.dir == 'b'? page.from : m::event::id::buf{}
@@ -148,7 +139,7 @@ get__messages(client &client,
 		else
 			end = at<"event_id"_>(event);
 
-		if(hit >= page.limit || miss >= size_t(max_filter_miss))
+		if(hit > page.limit || miss >= size_t(max_filter_miss))
 			break;
 
 		if(!visible(event, request.user_id))