diff --git a/crates/projection-irc/src/lib.rs b/crates/projection-irc/src/lib.rs
index b341ba8..46ba1a5 100644
--- a/crates/projection-irc/src/lib.rs
+++ b/crates/projection-irc/src/lib.rs
@@ -867,9 +867,11 @@ async fn handle_incoming_message(
                 if user.enabled_capabilities.contains(Capabilities::ChatHistory) {
                     let channel_name = match chan.clone() {
                         Chan::Global(chan) => chan,
+                        // TODO Respond with an error when a local channel is requested
                         Chan::Local(chan) => chan,
                     };
                     let room = core.get_room(&RoomId::try_from(channel_name.clone())?).await;
+                    // TODO Handle non-existent room
                     if let Some(room) = room {
                         let room_id = &RoomId::try_from(channel_name.clone())?;
                         let messages = user_handle.get_room_message_history(room_id, limit).await?;