diff --git a/src/emqx_pubsub.erl b/src/emqx_pubsub.erl
index 541007975..f67c3c8e4 100644
--- a/src/emqx_pubsub.erl
+++ b/src/emqx_pubsub.erl
@@ -70,7 +70,7 @@ publish(Topic, Msg) ->
                        emqx_router:match_local(Topic)), delivery(Msg)).
 
 route([], #mqtt_delivery{message = Msg}) ->
-    emqx_hooks:run('message.offline', [undefined, Msg]), 
+    emqx_hooks:run('message.dropped', [undefined, Msg]),
     dropped(Msg#mqtt_message.topic), ignore;
 
 %% Dispatch on the local node
@@ -98,7 +98,7 @@ forward(Node, To, Delivery) ->
 dispatch(Topic, Delivery = #mqtt_delivery{message = Msg, flows = Flows}) ->
     case subscribers(Topic) of
         [] ->
-            emqx_hooks:run('message.offline', [undefined, Msg]),
+            emqx_hooks:run('message.dropped', [undefined, Msg]),
             dropped(Topic), {ok, Delivery};
         [Sub] -> %% optimize?
             dispatch(Sub, Topic, Msg),
diff --git a/src/emqx_session.erl b/src/emqx_session.erl
index c46f50b97..1a9bfb65e 100644
--- a/src/emqx_session.erl
+++ b/src/emqx_session.erl
@@ -695,7 +695,7 @@ is_awaiting_full(#state{awaiting_rel = AwaitingRel, max_awaiting_rel = MaxLen})
 
 %% Enqueue message if the client has been disconnected
 dispatch(Msg, State = #state{client_id = ClientId, client_pid = undefined}) ->
-    case emqx_hooks:run('message.offline', [ClientId, Msg]) of
+    case emqx_hooks:run('message.dropped', [ClientId, Msg]) of
         ok   -> enqueue_msg(Msg, State);
         stop -> State
     end;
diff --git a/src/emqx_sm.erl b/src/emqx_sm.erl
index 1b652d600..8c9b1c8eb 100644
--- a/src/emqx_sm.erl
+++ b/src/emqx_sm.erl
@@ -117,7 +117,7 @@ dispatch(ClientId, Topic, Msg) ->
         Pid -> Pid ! {dispatch, Topic, Msg}
     catch
         error:badarg -> 
-            emqx_hooks:run('message.offline', [ClientId, Msg]),
+            emqx_hooks:run('message.dropped', [ClientId, Msg]),
             ok %%TODO: How??
     end.