diff --git a/examples/client/client.c b/examples/client/client.c
index 2a3191807..b986667c2 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -2290,14 +2290,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     }
     else {
 #ifdef WOLFSSL_EARLY_DATA
-    #ifndef HAVE_SESSION_TICKET
-        if (!usePsk) {
-        }
-        else
-    #endif
-        if (earlyData) {
+        if (usePsk && earlyData)
             EarlyData(ctx, ssl, msg, msgSz, buffer);
-        }
 #endif
         do {
             err = 0; /* reset error */
diff --git a/src/tls13.c b/src/tls13.c
index a79cb7601..b2229c2f1 100644
--- a/src/tls13.c
+++ b/src/tls13.c
@@ -8453,8 +8453,7 @@ int wolfSSL_write_early_data(WOLFSSL* ssl, const void* data, int sz, int* outSz)
         if (ret != WOLFSSL_SUCCESS)
             return WOLFSSL_FATAL_ERROR;
     }
-    if (ssl->options.handShakeState == CLIENT_HELLO_COMPLETE ||
-        ssl->options.handShakeState == HANDSHAKE_DONE) {
+    if (ssl->options.handShakeState == CLIENT_HELLO_COMPLETE) {
         ret = SendData(ssl, data, sz);
         if (ret > 0)
             *outSz = ret;