diff --git a/depot/containerstore/credmanager.go b/depot/containerstore/credmanager.go
index fe91ff12..c1e25109 100644
--- a/depot/containerstore/credmanager.go
+++ b/depot/containerstore/credmanager.go
@@ -430,8 +430,12 @@ func createCertificateTemplate(guid string, certSAN certificateSAN, notBefore, n
 	} else {
 		ipaddr = []net.IP{net.ParseIP(certSAN.IPAddress)}
 	}
-	dnsNames := []string{guid}
+	var dnsNames []string
+	if guid != "" {
+		dnsNames = append(dnsNames, guid)
+	}
 	for _, route := range certSAN.InternalRoutes {
+
 		dnsNames = append(dnsNames, route.Hostname)
 	}