diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 35506f7e..147ea5f4 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2954,7 +2954,7 @@ OPENSSL_EXPORT int SSL_set_dummy_pq_padding_size(SSL *ssl, size_t num_bytes);
 
 // SSL_dummy_pq_padding_used returns one if the server echoed a dummy PQ padding
 // extension and zero otherwise. It may only be called on a client connection
-// once the handshake has completed, otherwise it'll return zero.
+// once the ServerHello has been processed, otherwise it'll return zero.
 OPENSSL_EXPORT int SSL_dummy_pq_padding_used(SSL *ssl);
 
 
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
index 9f56d547..ef798311 100644
--- a/ssl/ssl_lib.cc
+++ b/ssl/ssl_lib.cc
@@ -2441,7 +2441,7 @@ int SSL_set_dummy_pq_padding_size(SSL *ssl, size_t num_bytes) {
 }
 
 int SSL_dummy_pq_padding_used(SSL *ssl) {
-  if (ssl->server || !ssl->s3->initial_handshake_complete) {
+  if (ssl->server) {
     return 0;
   }