diff --git a/rai/node.cpp b/rai/node.cpp
index ad159027..aff7025f 100644
--- a/rai/node.cpp
+++ b/rai/node.cpp
@@ -3816,11 +3816,11 @@ warmed_up (false)
 void rai::bootstrap_initiator::warmup (rai::endpoint const & endpoint_a)
 {
 	std::lock_guard <std::mutex> lock (mutex);
-	if (warmed_up.size () < 2 && !in_progress && warmed_up.find (endpoint_a) == warmed_up.end ())
+	if (!in_progress && warmed_up.size () < 2 && !in_progress && warmed_up.find (endpoint_a) == warmed_up.end ())
 	{
 		warmed_up.insert (endpoint_a);
-		in_progress = true;
 		notify_listeners ();
+		in_progress = true;
 		initiate (endpoint_a);
 	}
 }