diff --git a/main.cc b/main.cc
index 1a01486031..e60816bcd1 100644
--- a/main.cc
+++ b/main.cc
@@ -1212,6 +1212,8 @@ To start the scylla server proper, simply invoke as: scylla server (or just scyl
               // still be found in the config.
               tm.get_topology().set_host_id_cfg(host_id);
               tm.get_topology().add_or_update_endpoint(endpoint, host_id);
+              tm.get_new()->get_topology().set_host_id_cfg(host_id);
+              tm.get_new()->get_topology().add_or_update_endpoint(endpoint, host_id);
               return make_ready_future<>();
           }).get();
 
diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc
index edd09e2478..0f6321ef25 100644
--- a/test/lib/cql_test_env.cc
+++ b/test/lib/cql_test_env.cc
@@ -648,6 +648,13 @@ private:
                                             std::nullopt,
                                             locator::node::state::normal,
                                             smp::count);
+                auto& topo_new = tm.get_new()->get_topology();
+                topo_new.set_host_id_cfg(hostid);
+                topo_new.add_or_update_endpoint(utils::fb_utilities::get_broadcast_address(),
+                                                hostid,
+                                                std::nullopt,
+                                                locator::node::state::normal,
+                                                smp::count);
                 return make_ready_future<>();
             }).get();