diff --git a/src/emqttd_message.erl b/src/emqttd_message.erl
index 8f3d4ed40..d8e55e202 100644
--- a/src/emqttd_message.erl
+++ b/src/emqttd_message.erl
@@ -59,7 +59,7 @@ make(From, Topic, Payload) ->
     Topic   :: binary(),
     Payload :: binary().
 make(From, Qos, Topic, Payload) ->
-    #mqtt_message{msgid     = msgid(Qos),
+    #mqtt_message{msgid     = msgid(?QOS_I(Qos)),
                   topic     = Topic,
                   from      = From,
                   qos       = ?QOS_I(Qos),