diff --git a/backend/src/ee/routes/v1/pki-acme-router.ts b/backend/src/ee/routes/v1/pki-acme-router.ts
index 8b6c7c817..1e06a93e6 100644
--- a/backend/src/ee/routes/v1/pki-acme-router.ts
+++ b/backend/src/ee/routes/v1/pki-acme-router.ts
@@ -261,10 +261,12 @@ export const registerPkiAcmeRouter = async (server: FastifyZodProvider) => {
       }
     },
     handler: async (req, res) => {
-      const { profileId, accountId } = await validateExistingAccount({
-        req,
-        schema: FinalizeAcmeOrderBodySchema
+      const { profileId, accountId, payload } = await validateExistingAccount({
+        req
       });
+      if (payload !== "") {
+        throw new AcmeMalformedError({ detail: "Payload should be empty" });
+      }
       return sendAcmeResponse(
         res,
         profileId,
diff --git a/backend/src/ee/services/pki-acme/pki-acme-service.ts b/backend/src/ee/services/pki-acme/pki-acme-service.ts
index 134645fa5..a1c719912 100644
--- a/backend/src/ee/services/pki-acme/pki-acme-service.ts
+++ b/backend/src/ee/services/pki-acme/pki-acme-service.ts
@@ -276,7 +276,9 @@ export const pkiAcmeServiceFactory = ({
       authorizations: order.authorizations.map((auth: TPkiAcmeAuths) =>
         buildUrl(profileId, `/authorizations/${auth.id}`)
       ),
-      finalize: buildUrl(profileId, `/orders/${order.id}/finalize`)
+      finalize: buildUrl(profileId, `/orders/${order.id}/finalize`),
+      certificate:
+        order.status === AcmeOrderStatus.Valid ? buildUrl(profileId, `/orders/${order.id}/certificate`) : undefined
     };
   };