diff --git a/nano/core_test/rpc.cpp b/nano/core_test/rpc.cpp
index a6dc510a1..09656c0bf 100644
--- a/nano/core_test/rpc.cpp
+++ b/nano/core_test/rpc.cpp
@@ -436,7 +436,7 @@ TEST (rpc, stop)
 	{
 		ASSERT_NO_ERROR (system.poll ());
 	};
-	ASSERT_FALSE (system.nodes[0]->network.on);
+	ASSERT_FALSE (system.nodes[0]->network.socket.is_open ());
 }
 
 TEST (rpc, wallet_add)
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
index 807630b4b..d38156f8b 100644
--- a/nano/node/node.cpp
+++ b/nano/node/node.cpp
@@ -32,8 +32,7 @@ nano::network::network (nano::node & node_a, uint16_t port) :
 buffer_container (node_a.stats, nano::network::buffer_size, 4096), // 2Mb receive buffer
 socket (node_a.io_ctx, nano::endpoint (boost::asio::ip::address_v6::any (), port)),
 resolver (node_a.io_ctx),
-node (node_a),
-on (true)
+node (node_a)
 {
 	boost::thread::attributes attrs;
 	nano::thread_attributes::set (attrs);
@@ -98,7 +97,7 @@ void nano::network::receive ()
 	std::unique_lock<std::mutex> lock (socket_mutex);
 	auto data (buffer_container.allocate ());
 	socket.async_receive_from (boost::asio::buffer (data->buffer, nano::network::buffer_size), data->endpoint, [this, data](boost::system::error_code const & error, size_t size_a) {
-		if (!error && this->on)
+		if (!error && this->socket.is_open ())
 		{
 			data->size = size_a;
 			this->buffer_container.enqueue (data);
@@ -114,7 +113,7 @@ void nano::network::receive ()
 					this->node.logger.try_log (boost::str (boost::format ("UDP Receive error: %1%") % error.message ()));
 				}
 			}
-			if (this->on)
+			if (this->socket.is_open ())
 			{
 				this->node.alarm.add (std::chrono::steady_clock::now () + std::chrono::seconds (5), [this]() { this->receive (); });
 			}
@@ -125,7 +124,7 @@ void nano::network::receive ()
 void nano::network::process_packets ()
 {
 	auto local_endpoint (endpoint ());
-	while (on.load ())
+	while (socket.is_open ())
 	{
 		auto data (buffer_container.dequeue ());
 		if (data == nullptr)
@@ -140,7 +139,6 @@ void nano::network::process_packets ()
 
 void nano::network::stop ()
 {
-	on = false;
 	std::unique_lock<std::mutex> lock (socket_mutex);
 	if (socket.is_open ())
 	{
@@ -771,7 +769,7 @@ public:
 void nano::network::receive_action (nano::udp_data * data_a, nano::endpoint const & local_endpoint_a)
 {
 	auto allowed_sender (true);
-	if (!on)
+	if (!socket.is_open ())
 	{
 		allowed_sender = false;
 	}
@@ -2923,17 +2921,14 @@ void nano::network::send_buffer (uint8_t const * data_a, size_t size_a, nano::en
 	{
 		node.logger.try_log ("Sending packet");
 	}
-	if (on.load ())
-	{
-		socket.async_send_to (boost::asio::buffer (data_a, size_a), endpoint_a, [this, callback_a](boost::system::error_code const & ec, size_t size_a) {
-			callback_a (ec, size_a);
-			this->node.stats.add (nano::stat::type::traffic, nano::stat::dir::out, size_a);
-			if (ec == boost::system::errc::host_unreachable)
-			{
-				this->node.stats.inc (nano::stat::type::error, nano::stat::detail::unreachable_host, nano::stat::dir::out);
-			}
-		});
-	}
+	socket.async_send_to (boost::asio::buffer (data_a, size_a), endpoint_a, [this, callback_a](boost::system::error_code const & ec, size_t size_a) {
+		callback_a (ec, size_a);
+		this->node.stats.add (nano::stat::type::traffic, nano::stat::dir::out, size_a);
+		if (ec == boost::system::errc::host_unreachable)
+		{
+			this->node.stats.inc (nano::stat::type::error, nano::stat::detail::unreachable_host, nano::stat::dir::out);
+		}
+	});
 }
 
 std::shared_ptr<nano::node> nano::node::shared ()
diff --git a/nano/node/node.hpp b/nano/node/node.hpp
index 0572da68e..ad9c9b9e5 100644
--- a/nano/node/node.hpp
+++ b/nano/node/node.hpp
@@ -354,7 +354,6 @@ public:
 	boost::asio::ip::udp::resolver resolver;
 	std::vector<boost::thread> packet_processing_threads;
 	nano::node & node;
-	std::atomic<bool> on;
 	static size_t const buffer_size = 512;
 	static size_t const confirm_req_hashes_max = 6;
 };
diff --git a/nano/node/repcrawler.cpp b/nano/node/repcrawler.cpp
index 9f8b2c4b7..5c6793dc3 100644
--- a/nano/node/repcrawler.cpp
+++ b/nano/node/repcrawler.cpp
@@ -36,18 +36,15 @@ void nano::rep_crawler::ongoing_crawl ()
 {
 	auto now (std::chrono::steady_clock::now ());
 	query (get_crawl_targets ());
-	if (node.network.on)
-	{
-		// Reduce crawl frequency when there's enough total peer weight
-		unsigned next_run_seconds = (total_weight_internal () > node.config.online_weight_minimum.number ()) ? 7 : 3;
-		std::weak_ptr<nano::node> node_w (node.shared ());
-		node.alarm.add (now + std::chrono::seconds (next_run_seconds), [node_w, this]() {
-			if (auto node_l = node_w.lock ())
-			{
-				this->ongoing_crawl ();
-			}
-		});
-	}
+	// Reduce crawl frequency when there's enough total peer weight
+	unsigned next_run_seconds = (total_weight_internal () > node.config.online_weight_minimum.number ()) ? 7 : 3;
+	std::weak_ptr<nano::node> node_w (node.shared ());
+	node.alarm.add (now + std::chrono::seconds (next_run_seconds), [node_w, this]() {
+		if (auto node_l = node_w.lock ())
+		{
+			this->ongoing_crawl ();
+		}
+	});
 }
 
 std::vector<nano::endpoint> nano::rep_crawler::get_crawl_targets ()