diff --git a/config/envoyconfig/listeners.go b/config/envoyconfig/listeners.go
index 3b5c52e9d..a390762c0 100644
--- a/config/envoyconfig/listeners.go
+++ b/config/envoyconfig/listeners.go
@@ -633,11 +633,7 @@ func getAllServerNames(cfg *config.Config, addr string) ([]string, error) {
 		if err != nil {
 			return nil, err
 		}
-		for _, sn := range sns {
-			if !cryptutil.HasCertificateForServerName(certs, sn) {
-				serverNames.Add(sn)
-			}
-		}
+		serverNames.Add(sns...)
 	}
 
 	if addr == cfg.Options.GetGRPCAddr() {
@@ -645,11 +641,7 @@ func getAllServerNames(cfg *config.Config, addr string) ([]string, error) {
 		if err != nil {
 			return nil, err
 		}
-		for _, sn := range sns {
-			if !cryptutil.HasCertificateForServerName(certs, sn) {
-				serverNames.Add(sn)
-			}
-		}
+		serverNames.Add(sns...)
 	}
 
 	return serverNames.ToSlice(), nil
diff --git a/config/envoyconfig/listeners_test.go b/config/envoyconfig/listeners_test.go
index 01d709ebc..44d2c4b0d 100644
--- a/config/envoyconfig/listeners_test.go
+++ b/config/envoyconfig/listeners_test.go
@@ -1049,6 +1049,7 @@ func Test_getAllDomains(t *testing.T) {
 				"authenticate.example.com",
 				"b.example.com",
 				"c.example.com",
+				"d.unknown.example.com",
 			}
 			assert.Equal(t, expect, actual)
 		})