diff --git a/lib/nntp/tiny/session.py b/lib/nntp/tiny/session.py
index 33f4edb..f1c1b80 100644
--- a/lib/nntp/tiny/session.py
+++ b/lib/nntp/tiny/session.py
@@ -721,6 +721,13 @@ class Session():
         if len(newsgroups) == 0:
             return False
 
+        message.message_id_assign()
+
+        if not message.validate():
+            return self.respond(ResponseCode.NNTP_POST_FAILED)
+
+        self.db.add(message)
+
         for newsgroup in newsgroups:
             sql = """
                 insert into newsgroup_message (