diff --git a/src/noose/sqlite.rs b/src/noose/sqlite.rs
index 7262227..9e49340 100644
--- a/src/noose/sqlite.rs
+++ b/src/noose/sqlite.rs
@@ -1257,10 +1257,17 @@ impl Noose for NostrSqlite {
     ) -> Result<Vec<nostr::RelayMessage>, Error> {
         match self.query(subscription.filters, Order::Desc).await {
             Ok(events) => {
-                let relay_messages = events
+                
+                let relay_messages: Vec<RelayMessage> = events
                     .into_iter()
                     .map(|event| nostr::RelayMessage::event(subscription.id.clone(), event))
                     .collect();
+
+                if relay_messages.is_empty() {
+                    let eose = RelayMessage::eose(subscription.id.clone());
+                    return Ok(vec![eose]);
+                }
+
                 Ok(relay_messages)
             }
             Err(err) => Err(Error::bad_request(err.to_string())),