diff --git a/crypto/ocsp/internal.h b/crypto/ocsp/internal.h
index c780fb6bf0..a75c50ba03 100644
--- a/crypto/ocsp/internal.h
+++ b/crypto/ocsp/internal.h
@@ -21,7 +21,8 @@ extern "C" {
 
 // OCSPResponseStatus does not have a status assigned to the value 4.
 //
-// See Reason Code RFC: https://datatracker.ietf.org/doc/html/rfc6960#section-4.2.1
+// See Reason Code RFC:
+// https://datatracker.ietf.org/doc/html/rfc6960#section-4.2.1
 #define OCSP_UNASSIGNED_RESPONSE_STATUS 4
 
 // OCSP Request ASN.1 specification:
@@ -240,6 +241,14 @@ DECLARE_ASN1_FUNCTIONS(OCSP_SIGNATURE)
 DECLARE_ASN1_FUNCTIONS(OCSP_RESPBYTES)
 DECLARE_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
 
+// OCSP_get_default_digest sets the default digest according to |signer|.
+// This exists because OpenSSL sets the default to |EVP_sha256| when passing
+// NULL for |type| in |EVP_DigestSignInit| when using certain key types. We wish
+// to avoid this general behavior for all |EVP_DigestSign*| operations, so we
+// only set the default digest from the OCSP layer. |dgst| represents the user's
+// self-defined digest type, if it's non-NULL, |dgst| is directly returned.
+const EVP_MD *OCSP_get_default_digest(const EVP_MD *dgst, EVP_PKEY *signer);
+
 // Try exchanging request and response via HTTP on (non-)blocking BIO in rctx.
 OPENSSL_EXPORT int OCSP_REQ_CTX_nbio(OCSP_REQ_CTX *rctx);
 
diff --git a/crypto/ocsp/ocsp_client.c b/crypto/ocsp/ocsp_client.c
index 9b4add7698..56bb5bc80a 100644
--- a/crypto/ocsp/ocsp_client.c
+++ b/crypto/ocsp/ocsp_client.c
@@ -86,10 +86,16 @@ int OCSP_request_sign(OCSP_REQUEST *req, X509 *signer, EVP_PKEY *key,
       OPENSSL_PUT_ERROR(OCSP, OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
       goto err;
     }
+    const EVP_MD *init_dgst = OCSP_get_default_digest(dgst, key);
+    if (init_dgst == NULL) {
+      OPENSSL_PUT_ERROR(OCSP, EVP_R_NO_DEFAULT_DIGEST);
+      goto err;
+    }
+
     if (!ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),
                         req->optionalSignature->signatureAlgorithm, NULL,
                         req->optionalSignature->signature, req->tbsRequest, key,
-                        dgst)) {
+                        init_dgst)) {
       goto err;
     }
   }
diff --git a/crypto/ocsp/ocsp_server.c b/crypto/ocsp/ocsp_server.c
index 30e1cd8190..843af79040 100644
--- a/crypto/ocsp/ocsp_server.c
+++ b/crypto/ocsp/ocsp_server.c
@@ -172,20 +172,37 @@ static int OCSP_basic_sign_ctx(OCSP_BASICRESP *resp, X509 *signer,
   return 1;
 }
 
+const EVP_MD *OCSP_get_default_digest(const EVP_MD *dgst, EVP_PKEY *signer) {
+  if (dgst != NULL) {
+    return dgst;
+  }
+  int pkey_nid = EVP_PKEY_id(signer);
+  if (pkey_nid == EVP_PKEY_EC || pkey_nid == EVP_PKEY_RSA ||
+      pkey_nid == EVP_PKEY_DSA) {
+    return EVP_sha256();
+  }
+  return NULL;
+}
+
 int OCSP_basic_sign(OCSP_BASICRESP *resp, X509 *signer, EVP_PKEY *key,
                     const EVP_MD *dgst, STACK_OF(X509) *certs,
                     unsigned long flags) {
   GUARD_PTR(resp);
   GUARD_PTR(signer);
   GUARD_PTR(key);
-  GUARD_PTR(dgst);
+
+  const EVP_MD *init_dgst = OCSP_get_default_digest(dgst, key);
+  if (init_dgst == NULL) {
+    OPENSSL_PUT_ERROR(OCSP, EVP_R_NO_DEFAULT_DIGEST);
+    return 0;
+  }
 
   EVP_MD_CTX *ctx = EVP_MD_CTX_new();
   if (ctx == NULL) {
     return 0;
   }
 
-  if (!EVP_DigestSignInit(ctx, NULL, dgst, NULL, key)) {
+  if (!EVP_DigestSignInit(ctx, NULL, init_dgst, NULL, key)) {
     EVP_MD_CTX_free(ctx);
     return 0;
   }
diff --git a/crypto/ocsp/ocsp_test.cc b/crypto/ocsp/ocsp_test.cc
index 31ac1f6d7b..3db23e1909 100644
--- a/crypto/ocsp/ocsp_test.cc
+++ b/crypto/ocsp/ocsp_test.cc
@@ -973,6 +973,8 @@ static const OCSPRequestTestVector kRequestTestVectors[] = {
      "rsa_key", EVP_sha1()},
     {"ocsp_request", OCSP_REQUEST_PARSE_SUCCESS, OCSP_SIGN_SUCCESS, "rsa_cert",
      "rsa_key", EVP_sha256()},
+    {"ocsp_request", OCSP_REQUEST_PARSE_SUCCESS, OCSP_SIGN_SUCCESS, "rsa_cert",
+     "rsa_key", nullptr},
     {"ocsp_request_attached_cert", OCSP_REQUEST_PARSE_SUCCESS, OCSP_SIGN_ERROR,
      "rsa_cert", "rsa_key", nullptr},
     {"ocsp_request_no_nonce", OCSP_REQUEST_PARSE_SUCCESS, OCSP_SIGN_SUCCESS,
@@ -988,6 +990,8 @@ static const OCSPRequestTestVector kRequestTestVectors[] = {
      "ecdsa_cert", "ecdsa_key", EVP_sha1()},
     {"ocsp_request", OCSP_REQUEST_PARSE_SUCCESS, OCSP_SIGN_SUCCESS,
      "ecdsa_cert", "ecdsa_key", EVP_sha256()},
+    {"ocsp_request", OCSP_REQUEST_PARSE_SUCCESS, OCSP_SIGN_SUCCESS,
+     "ecdsa_cert", "ecdsa_key", nullptr},
     {"ocsp_request_no_nonce", OCSP_REQUEST_PARSE_SUCCESS, OCSP_SIGN_SUCCESS,
      "rsa_cert", "rsa_key", EVP_sha256()},
     {"ocsp_request_no_nonce", OCSP_REQUEST_PARSE_SUCCESS, OCSP_SIGN_SUCCESS,
@@ -1137,10 +1141,12 @@ static const OCSPResponseSignTestVector kOCSPResponseSignTestVectors[] = {
     {OCSP_SIGN_SUCCESS, "rsa_cert", "rsa_key", EVP_sha1()},
     {OCSP_SIGN_SUCCESS, "rsa_cert", "rsa_key", EVP_sha256()},
     {OCSP_SIGN_SUCCESS, "rsa_cert", "rsa_key", EVP_sha512()},
+    {OCSP_SIGN_SUCCESS, "rsa_cert", "rsa_key", nullptr},
     // Test signing with ECDSA certs and keys.
     {OCSP_SIGN_SUCCESS, "ecdsa_cert", "ecdsa_key", EVP_sha1()},
     {OCSP_SIGN_SUCCESS, "ecdsa_cert", "ecdsa_key", EVP_sha256()},
     {OCSP_SIGN_SUCCESS, "ecdsa_cert", "ecdsa_key", EVP_sha512()},
+    {OCSP_SIGN_SUCCESS, "ecdsa_cert", "ecdsa_key", nullptr},
     // Test certificate type mismatch.
     {OCSP_SIGN_ERROR, "rsa_cert", "ecdsa_key", EVP_sha256()},
     {OCSP_SIGN_ERROR, "ecdsa_cert", "rsa_key", EVP_sha256()},