diff --git a/src/internal.c b/src/internal.c
index 59efc5a3e..73f640511 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -14327,6 +14327,7 @@ int CreateOcspResponse(WOLFSSL* ssl, OcspRequest** ocspRequest,
         }
 
         if (request != NULL && ret != 0) {
+            FreeOcspRequest(request);
             XFREE(request, ssl->heap, DYNAMIC_TYPE_OCSP_REQUEST);
             request = NULL;
         }
@@ -14983,6 +14984,7 @@ int SendCertificateStatus(WOLFSSL* ssl)
 
 
                         i++;
+                        FreeOcspRequest(request);
                     }
                 }
 
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 122987de4..c13ba0036 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -14665,9 +14665,11 @@ void FreeOcspRequest(OcspRequest* req)
     if (req) {
         if (req->serial)
             XFREE(req->serial, req->heap, DYNAMIC_TYPE_OCSP_REQUEST);
+        req->serial = NULL;
 
         if (req->url)
             XFREE(req->url, req->heap, DYNAMIC_TYPE_OCSP_REQUEST);
+        req->url = NULL;
     }
 }