diff --git a/agent/agent.go b/agent/agent.go
index 8db8d19ad..800302c1a 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -1226,7 +1226,7 @@ func (a *Agent) ShutdownEndpoints() {
 	a.shutdownLock.Lock()
 	defer a.shutdownLock.Unlock()
 
-	if len(a.dnsServers) == 0 || len(a.httpServers) == 0 {
+	if len(a.dnsServers) == 0 && len(a.httpServers) == 0 {
 		return
 	}