diff --git a/lib/nntp/tiny/session.py b/lib/nntp/tiny/session.py
index c4e3d3a..4adee06 100644
--- a/lib/nntp/tiny/session.py
+++ b/lib/nntp/tiny/session.py
@@ -574,11 +574,18 @@ class Session():
 
             cr = self.db.query_sql(Message, sql, (self.newsgroup.id,))
 
-            self.respond(ResponseCode.NNTP_HEADERS_FOLLOW)
+            first = True
 
             for message in cr.each():
+                if first:
+                    first = False
+                    self.respond(ResponseCode.NNTP_HEADERS_FOLLOW)
+
                 self._send_message_header(message, name)
 
+            if first:
+                return self.respond(ResponseCode.NNTP_ARTICLE_NOT_FOUND_RANGE)
+
         return self.end()
 
     def _cmd_stat(self, identifier: Optional[str]=None):