diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java
index 48d25b542ebd1d4dfb94ab379709737278791ad6..55c9ee0e139cf7a3f8e732ea550de45e2a96e6c7 100644
--- a/jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java
+++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java
@@ -162,19 +162,25 @@ public class OCSPWorker extends X509Worker<String> {
             throws OCSPException {
         CertificateID certificateID = request.getCertID();
         // Build Extensions
-        Extensions extensions = new Extensions(new Extension[] {});
         Extensions requestExtensions = request.getSingleRequestExtensions();
         if (requestExtensions != null) {
             Extension nonceExtension =
                     requestExtensions.getExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce);
-            if (nonceExtension != null) extensions = new Extensions(nonceExtension);
+            Extensions extensions = new Extensions(nonceExtension);
+            responseBuilder.addResponse(
+                    certificateID,
+                    OCSPCertificateStatusMapper.getStatus(
+                            getCertificateSummary(request.getCertID().getSerialNumber(), unknown)),
+                    new Date(),
+                    new Date(new Date().getTime() + crlLifetime),
+                    extensions);
+        } else {
+            responseBuilder.addResponse(
+                    certificateID,
+                    OCSPCertificateStatusMapper.getStatus(
+                            getCertificateSummary(request.getCertID().getSerialNumber(), unknown)),
+                    new Date(),
+                    new Date(new Date().getTime() + crlLifetime));
         }
-        responseBuilder.addResponse(
-                certificateID,
-                OCSPCertificateStatusMapper.getStatus(
-                        getCertificateSummary(request.getCertID().getSerialNumber(), unknown)),
-                new Date(),
-                new Date(new Date().getTime() + crlLifetime),
-                extensions);
     }
 }