diff --git a/server/server.cc b/server/server.cc
index ddab863..b34cbbd 100644
--- a/server/server.cc
+++ b/server/server.cc
@@ -187,7 +187,7 @@ void Server::CloseHandler(ClientHandler *handler) {
 // the client.
 void Server::ListenerCoroutine(toolbelt::UnixSocket &listen_socket) {
   for (;;) {
-    if (!running_) {
+    if (shutting_down_) {
       // Keep this running until all other coroutines have completed.
       // This is to make sure that other coroutines that have publisher
       // and subscribers are able to connect to the server and delete them
diff --git a/server/server.h b/server/server.h
index 0a5b3a4..c4dc049 100644
--- a/server/server.h
+++ b/server/server.h
@@ -223,7 +223,6 @@ class Server {
   std::string socket_name_;
   uint64_t session_id_;
   std::vector<std::unique_ptr<ClientHandler>> client_handlers_;
-  bool running_ = false;
   std::string server_id_;
   std::string hostname_;
   std::string interface_;