diff --git a/trustmanager/X509FileStore.go b/trustmanager/X509FileStore.go
index c4a878f5b1..d4b8b6ce9e 100644
--- a/trustmanager/X509FileStore.go
+++ b/trustmanager/X509FileStore.go
@@ -58,12 +58,8 @@ func (s X509FileStore) AddCert(cert *x509.Certificate) error {
 	}
 
 	var filename string
-	if cert.Subject.CommonName != "" {
-		filename = path.Join(s.baseDir, cert.Subject.CommonName+certExtension)
-	} else {
-		fingerprint := FingerprintCert(cert)
-		filename = path.Join(s.baseDir, string(fingerprint)+certExtension)
-	}
+	fingerprint := string(FingerprintCert(cert))
+	filename = path.Join(s.baseDir, cert.Subject.CommonName, fingerprint+certExtension)
 
 	if err := s.addNamedCert(cert, filename); err != nil {
 		return err