diff --git a/src/server_state.cpp b/src/server_state.cpp
index 270c45e..c727dba 100644
--- a/src/server_state.cpp
+++ b/src/server_state.cpp
@@ -1364,6 +1364,10 @@ void wsrep::server_state::state(
 
     if (allowed[state_][state] == false)
     {
+        /* If we are disconnecting ignore any remaining state events from
+         * the replication queue */
+        if (s_disconnecting == state_) return;
+
         std::ostringstream os;
         os << "server: " << name_ << " unallowed state transition: "
            << wsrep::to_string(state_) << " -> " << wsrep::to_string(state);