diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index bea6e2750..8d0e54315 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -950,7 +950,7 @@ int ssl3_get_client_hello(SSL *s)
 #endif
 	STACK_OF(SSL_CIPHER) *ciphers=NULL;
 
-	if (s->state == SSL3_ST_SR_CLNT_HELLO_C)
+	if (s->state == SSL3_ST_SR_CLNT_HELLO_C && !s->first_packet)
 		goto retry_cert;
 
 	/* We do this so that we will respond with our native type.