diff --git a/nano/core_test/bootstrap.cpp b/nano/core_test/bootstrap.cpp
index 7a752d0d..8ef2d944 100644
--- a/nano/core_test/bootstrap.cpp
+++ b/nano/core_test/bootstrap.cpp
@@ -459,10 +459,7 @@ TEST (bootstrap_processor, DISABLED_push_diamond_pruning)
 	node1->stop ();
 }
 
-// Test disabled because it's failing intermittently.
-// PR in which it got disabled: https://github.com/nanocurrency/nano-node/pull/3532
-// Issue for investigating it: https://github.com/nanocurrency/nano-node/issues/3533
-TEST (bootstrap_processor, DISABLED_push_one)
+TEST (bootstrap_processor, push_one)
 {
 	nano::system system;
 	nano::node_config config (nano::get_available_port (), system.logging);
diff --git a/nano/node/bootstrap/bootstrap_frontier.cpp b/nano/node/bootstrap/bootstrap_frontier.cpp
index 935c70eb..219a4e24 100644
--- a/nano/node/bootstrap/bootstrap_frontier.cpp
+++ b/nano/node/bootstrap/bootstrap_frontier.cpp
@@ -192,6 +192,7 @@ void nano::frontier_req_client::received_frontier (boost::system::error_code con
 				// Set last processed account as new start target
 				attempt->set_start_account (last_account);
 			}
+			connection->connections.pool_connection (connection);
 			try
 			{
 				promise.set_value (false);
@@ -199,7 +200,6 @@ void nano::frontier_req_client::received_frontier (boost::system::error_code con
 			catch (std::future_error &)
 			{
 			}
-			connection->connections.pool_connection (connection);
 		}
 	}
 	else