diff --git a/src/internal.c b/src/internal.c
index 0ffaae6c4..4590e596d 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -14048,8 +14048,10 @@ int CreateOcspResponse(WOLFSSL* ssl, OcspRequest** ocspRequest,
                                                                    der->length);
         }
 
-        if (request != NULL)
+        if (request != NULL && ret != 0) {
             XFREE(request, ssl->heap, DYNAMIC_TYPE_OCSP_REQUEST);
+            request = NULL;
+        }
     #ifdef WOLFSSL_SMALL_STACK
         XFREE(cert, ssl->heap, DYNAMIC_TYPE_DCERT);
     #endif