diff --git a/ChangeLog b/ChangeLog
index 8e315f793..5fa1bebaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.3-dev, 2010-07-28
+v0.3.3-dev, 2010-08-03
 
 
 Version 0.3.3 (under dev!)
@@ -24,6 +24,8 @@ Version 0.3.3 (under dev!)
   (bug #30296)
 * api: add function "string_expand_home", fix bug with replacement of home in
   paths
+* irc: fix bug in parser when no argument is received after command, no
+  callback was called, and message was silently ignored (bug #30640)
 * irc: add new option irc.look.nick_color_stop_chars
 * irc: fix import of certificates created by openssl >= 1.0.0 (bug #30316)
 * irc: fix display of local SSL certificate when it is sent to server
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 818891f72..75b117902 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -1315,6 +1315,11 @@ irc_server_parse_message (const char *message, char **nick, char **host,
                 }
             }
         }
+        else
+        {
+            if (command)
+                *command = strdup (pos);
+        }
     }
 }