diff --git a/src/message.c b/src/message.c
index 34a2692..6b994e5 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1137,6 +1137,10 @@
     if (messages_history_new > 10000)
         return FAIL;
 
+    // "wait" must be <= 10000
+    if (messages_wait_new > 10000)
+        return FAIL;
+
     msg_flags = messages_flags_new;
     msg_wait = messages_wait_new;