diff --git a/src/tcp_server.cpp b/src/tcp_server.cpp
index 31c6e5e..8e0793e 100644
--- a/src/tcp_server.cpp
+++ b/src/tcp_server.cpp
@@ -27,7 +27,6 @@ TCPServer::TCPServer(int default_backlog, allocate_client_callback allocate_new_
 	: m_allocateNewClient(allocate_new_client)
 	, m_defaultBacklog(default_backlog)
 	, m_loopThread{}
-	, m_loopThreadRunning(false)
 #ifdef WITH_UPNP
 	, m_portMapping(0)
 #endif
@@ -474,9 +473,7 @@ void TCPServer::shutdown_tcp()
 	}
 #endif
 
-	if (m_loopThreadRunning.load()) {
-		uv_thread_join(&m_loopThread);
-	}
+	uv_thread_join(&m_loopThread);
 
 	uv_mutex_destroy(&m_bansLock);
 
@@ -581,8 +578,6 @@ const char* TCPServer::get_log_category() const
 void TCPServer::loop(void* data)
 {
 	TCPServer* server = static_cast<TCPServer*>(data);
-	server->m_loopThreadRunning.exchange(true);
-	ON_SCOPE_LEAVE([server]() { server->m_loopThreadRunning.exchange(false); });
 
 	log_category_prefix = server->get_log_category();
 
diff --git a/src/tcp_server.h b/src/tcp_server.h
index e255051..20c7d53 100644
--- a/src/tcp_server.h
+++ b/src/tcp_server.h
@@ -149,7 +149,6 @@ protected:
 	int m_defaultBacklog;
 
 	uv_thread_t m_loopThread;
-	std::atomic<bool> m_loopThreadRunning;
 
 	static void loop(void* data);