diff --git a/deps/rabbit/src/rabbit_vhosts.erl b/deps/rabbit/src/rabbit_vhosts.erl
index 641522d0fc95..42fd158c1fd9 100644
--- a/deps/rabbit/src/rabbit_vhosts.erl
+++ b/deps/rabbit/src/rabbit_vhosts.erl
@@ -51,7 +51,7 @@ boot() ->
 %% See start_processes_for_all/1.
 -spec reconcile() -> 'ok'.
 reconcile() ->
-    case is_reconciliation_enabled() of
+    case rabbit:is_running() andalso is_reconciliation_enabled() of
         false -> ok;
         true  ->
             _ = reconcile_once(),
diff --git a/deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl b/deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl
index 85e5120ca037..453d648a353c 100644
--- a/deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl
+++ b/deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl
@@ -91,7 +91,10 @@ reset_nodes([], _Leader) ->
     ok;
 reset_nodes([Node| Nodes], Leader) ->
     ok = rabbit_control_helper:command(stop_app, Node),
-    ok = rabbit_control_helper:command(forget_cluster_node, Leader, [atom_to_list(Node)]),
+    case rabbit_control_helper:command(forget_cluster_node, Leader, [atom_to_list(Node)]) of
+        ok -> ok;
+        {error, _, <<"Error:\n{:not_a_cluster_node, ~c\"The node selected is not in the cluster.\"}">>} -> ok
+    end,
     ok = rabbit_control_helper:command(reset, Node),
     ok = rabbit_control_helper:command(start_app, Node),
     reset_nodes(Nodes, Leader).