diff --git a/test/integration/server.cc b/test/integration/server.cc
index 4203d3f42d3a3..eb2fea801fe38 100644
--- a/test/integration/server.cc
+++ b/test/integration/server.cc
@@ -297,7 +297,7 @@ IntegrationTestServerImpl::~IntegrationTestServerImpl() {
       server_gone_.WaitForNotification();
     }
   } else {
-    if (server_) {
+    if (!server_gone_.HasBeenNotified()) {
       server_->dispatcher().post([this]() { server_->shutdown(); });
       server_gone_.WaitForNotification();
     }