diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc
index 73d0a6b4f7..195301c615 100644
--- a/db/system_keyspace.cc
+++ b/db/system_keyspace.cc
@@ -2607,8 +2607,9 @@ future<service::topology> system_keyspace::load_topology_state() {
             ret.tstate = service::transition_state_from_string(some_row.get_as<sstring>("transition_state"));
         } else {
             // Any remaining transition_nodes must be in left_token_ring state
+            // or rebuilding
             auto it = std::find_if(ret.transition_nodes.begin(), ret.transition_nodes.end(),
-                    [] (auto& p) { return p.second.state != service::node_state::left_token_ring; });
+                    [] (auto& p) { return p.second.state != service::node_state::left_token_ring && p.second.state != service::node_state::rebuilding; });
             if (it != ret.transition_nodes.end()) {
                 on_internal_error(slogger, format(
                     "load_topology_state: topology not in transition state"