diff --git a/src/github.com/matrix-org/dendrite/roomserver/publicroom/public_room.go b/src/github.com/matrix-org/dendrite/roomserver/publicroom/public_room.go
index cc1584836..e04ca3121 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/publicroom/public_room.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/publicroom/public_room.go
@@ -108,6 +108,7 @@ func (r *RoomserverPublicRoomAPI) GetPublicRooms(
 	req *api.GetPublicRoomsRequest,
 	response *api.GetPublicRoomsResponse,
 ) error {
+	// TODO: Limit by req.Limit and offset by req.Since
 	roomIDs, err := r.DB.GetPublicRoomIDs()
 	if err != nil {
 		return err