diff --git a/internal/storage/mongo.go b/internal/storage/mongo.go
index b4d8d8b..d116829 100644
--- a/internal/storage/mongo.go
+++ b/internal/storage/mongo.go
@@ -177,20 +177,7 @@ func (m *MongoStore) ListCertificates() []*pki.Certificate {
 	}
 	defer cursor.Close(ctx)
 
-	var certs []*pki.Certificate
-	if err = cursor.All(ctx, &certs); err != nil {
-		return []*pki.Certificate{}
-	}
-
-	// Reconvertir les documents en certificats
 	var results []*pki.Certificate
-	if err = cursor.All(ctx, &[]CertificateDoc{}); err != nil {
-		return []*pki.Certificate{}
-	}
-
-	cursor, _ = m.collection.Find(ctx, bson.M{})
-	defer cursor.Close(ctx)
-
 	for cursor.Next(ctx) {
 		var doc CertificateDoc
 		if err := cursor.Decode(&doc); err != nil {
@@ -209,9 +196,10 @@ func (m *MongoStore) ListCertificates() []*pki.Certificate {
 
 		// Décoder le certificat X.509
 		if doc.Cert != "" {
-			certBytes, _ := base64.StdEncoding.DecodeString(doc.Cert)
-			if parsedCert, _ := parseCertificate(certBytes); parsedCert != nil {
-				cert.Cert = parsedCert
+			if certBytes, err := base64.StdEncoding.DecodeString(doc.Cert); err == nil {
+				if parsedCert, err := parseCertificate(certBytes); err == nil && parsedCert != nil {
+					cert.Cert = parsedCert
+				}
 			}
 		}