diff --git a/src/emqttd_mnesia.erl b/src/emqttd_mnesia.erl
index d8e0f88af..9c713cdd6 100644
--- a/src/emqttd_mnesia.erl
+++ b/src/emqttd_mnesia.erl
@@ -187,9 +187,11 @@ remove_from_cluster(Node) when Node =/= node() ->
         {true, true} ->
             ensure_ok(rpc:call(Node, ?MODULE, ensure_stopped, [])),
             ensure_ok(del_schema_copy(Node)),
-            ensure_ok(rpc:call(Node, ?MODULE, delete_schema, []));
+            ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])),
+            mnesia_lib:del(extra_db_nodes, Node);
         {true, false} ->
-            ensure_ok(del_schema_copy(Node));
+            ensure_ok(del_schema_copy(Node)),
+            mnesia_lib:del(extra_db_nodes, Node);
             %ensure_ok(rpc:call(Node, ?MODULE, delete_schema, []));
         {false, _} ->
             {error, node_not_in_cluster}