diff --git a/src/emqttd_session.erl b/src/emqttd_session.erl
index f53f363a4..b6add0581 100644
--- a/src/emqttd_session.erl
+++ b/src/emqttd_session.erl
@@ -332,10 +332,16 @@ handle_cast({unsubscribe, TopicTable}, Session = #session{client_id     = Client
         end, Subscriptions, TopicTable),
     hibernate(Session#session{subscriptions = Subscriptions1});
 
-handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId}) ->
+handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client_pid = undefined}) ->
     ?LOG(warning, "destroyed", [], Session),
     shutdown(destroy, Session);
 
+%% 
+handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client_pid = OldClientPid}) ->
+    ?LOG(warning, "kickedout~p", [OldClientPid], Session),
+    shutdown(conflict, Session);
+
+
 handle_cast({resume, ClientId, ClientPid}, Session = #session{client_id      = ClientId,
                                                               client_pid     = OldClientPid,
                                                               clean_sess     = CleanSess,