diff --git a/src/emqttd_mod_presence.erl b/src/emqttd_mod_presence.erl
index 57a02c1bf..1aa382fa2 100644
--- a/src/emqttd_mod_presence.erl
+++ b/src/emqttd_mod_presence.erl
@@ -52,7 +52,7 @@ client_connected(ConnAck, #mqtt_client{client_id  = ClientId,
                               proplists:get_value(qos, Opts, 0),
                               topic(connected, ClientId),
                               iolist_to_binary(Json)),
-    emqttd_pubsub:publish(Msg).
+    emqttd:publish(Msg).
 
 client_disconnected(Reason, ClientId, Opts) ->
     Json = mochijson2:encode([{clientid, ClientId},
@@ -62,7 +62,7 @@ client_disconnected(Reason, ClientId, Opts) ->
                               proplists:get_value(qos, Opts, 0),
                               topic(disconnected, ClientId),
                               iolist_to_binary(Json)),
-    emqttd_pubsub:publish(Msg).
+    emqttd:publish(Msg).
 
 unload(_Opts) ->
     emqttd_broker:unhook('client.connected', {?MODULE, client_connected}),
diff --git a/src/emqttd_protocol.erl b/src/emqttd_protocol.erl
index 536474ce4..6764d201c 100644
--- a/src/emqttd_protocol.erl
+++ b/src/emqttd_protocol.erl
@@ -302,7 +302,7 @@ maybe_set_clientid(State) ->
 send_willmsg(_ClientId, undefined) ->
     ignore;
 send_willmsg(ClientId, WillMsg) -> 
-    emqttd_pubsub:publish(WillMsg#mqtt_message{from = ClientId}).
+    emqttd:publish(WillMsg#mqtt_message{from = ClientId}).
 
 start_keepalive(0) -> ignore;