diff --git a/src/acme2.js b/src/acme2.js
index 7586dfbcf..c454743e2 100644
--- a/src/acme2.js
+++ b/src/acme2.js
@@ -524,13 +524,7 @@ Acme2.prototype.getCertificate = async function () {
 
     await this.loadDirectory();
     const result = await this.acmeFlow();
-
     debug(`getCertificate: acme flow completed for ${this.cn}`);
-
-    await blobs.setString(`${blobs.CERT_PREFIX}-${this.certName}.key`, result.key);
-    await blobs.setString(`${blobs.CERT_PREFIX}-${this.certName}.cert`, result.cert);
-    await blobs.setString(`${blobs.CERT_PREFIX}-${this.certName}.csr`, result.csr);
-
     return result;
 };
 
diff --git a/src/reverseproxy.js b/src/reverseproxy.js
index d66edc0c3..6fb371769 100644
--- a/src/reverseproxy.js
+++ b/src/reverseproxy.js
@@ -422,7 +422,12 @@ async function ensureCertificate(location, options, auditSource) {
     }
 
     debug(`ensureCertificate: ${fqdn} needs acme cert`);
-    const [error] = await safe(acme2.getCertificate(fqdn, domainObject));
+    const [error, result] = await safe(acme2.getCertificate(fqdn, domainObject));
+
+    await blobs.setString(`${blobs.CERT_PREFIX}-${certName}.key`, result.key);
+    await blobs.setString(`${blobs.CERT_PREFIX}-${certName}.cert`, result.cert);
+    await blobs.setString(`${blobs.CERT_PREFIX}-${certName}.csr`, result.csr);
+
     debug(`ensureCertificate: error: ${error ? error.message : 'null'}`);
 
     await safe(eventlog.add(eventlog.ACTION_CERTIFICATE_NEW, auditSource, { domain: fqdn, errorMessage: error?.message || '' }));