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