diff --git a/src/emqttd.app.src b/src/emqttd.app.src
index bbde5e17f..2a08549a0 100644
--- a/src/emqttd.app.src
+++ b/src/emqttd.app.src
@@ -1,7 +1,7 @@
 {application, emqttd,
  [
   {description, "Erlang MQTT Broker"},
-  {vsn, "0.10.0"},
+  {vsn, "0.10.1"},
   {modules, []},
   {registered, []},
   {applications, [kernel,
diff --git a/src/emqttd_app.erl b/src/emqttd_app.erl
index 159062b16..460f2ce49 100644
--- a/src/emqttd_app.erl
+++ b/src/emqttd_app.erl
@@ -134,10 +134,7 @@ worker_spec(Name, Opts) ->
 
 %% close all listeners first...
 prep_stop(State) ->
-    stop_listeners(), 
-    timer:sleep(2),
-    emqttd_plugins:unload(),
-    timer:sleep(2),
+    stop_listeners(),
     State.
 
 stop_listeners() ->
diff --git a/src/emqttd_ctl.erl b/src/emqttd_ctl.erl
index 7f1a339d0..aaca6be26 100644
--- a/src/emqttd_ctl.erl
+++ b/src/emqttd_ctl.erl
@@ -79,6 +79,7 @@ cluster([SNode]) ->
     pong ->
         case emqttd:is_running(Node) of
             true ->
+                emqttd_plugins:unload(),
                 application:stop(emqttd),
                 application:stop(esockd),
                 application:stop(gproc),