diff --git a/src/tls13.c b/src/tls13.c
index a9571415b..5fd0ac1e5 100644
--- a/src/tls13.c
+++ b/src/tls13.c
@@ -3958,6 +3958,10 @@ static int FindPsk(WOLFSSL* ssl, PreSharedKey* psk, byte* suite, int* err)
             /* Derive the early secret using the PSK. */
             ret = DeriveEarlySecret(ssl);
         }
+        if ((ret == 0) && found) {
+            /* PSK negotiation has succeeded */
+            ssl->options.isPSK = 1;
+        }
     }
 
     *err = ret;
@@ -6912,6 +6916,13 @@ int DoTls13Finished(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
     /* verify the client sent certificate if required */
     if (ssl->options.side == WOLFSSL_SERVER_END && !ssl->options.resuming &&
             (ssl->options.mutualAuth || ssl->options.failNoCert)) {
+#ifdef OPENSSL_COMPATIBLE_DEFAULTS
+        if (ssl->options.isPSK) {
+            WOLFSSL_MSG("TLS v1.3 client used PSK but cert required. Allowing "
+                        "for OpenSSL compatibility");
+        }
+        else
+#endif
         if (!ssl->options.havePeerCert || !ssl->options.havePeerVerify) {
             ret = NO_PEER_CERT; /* NO_PEER_VERIFY */
             WOLFSSL_MSG("TLS v1.3 client did not present peer cert");
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index 63045e0ad..7b12d9b35 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -3633,6 +3633,7 @@ typedef struct Options {
     word16            failNoCertxPSK:1;   /* fail for no cert except with PSK */
     word16            downgrade:1;        /* allow downgrade of versions */
     word16            resuming:1;
+    word16            isPSK:1;
     word16            haveSessionId:1;    /* server may not send */
     word16            tls:1;              /* using TLS ? */
     word16            tls1_1:1;           /* using TLSv1.1+ ? */