diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index c384364f8..dee6cd8ab 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -2073,7 +2073,7 @@ static int ssl_write_certificate_request( ssl_context *ssl )
     crt = ssl->ca_chain;
 
     total_dn_size = 0;
-    while( crt != NULL )
+    while( crt != NULL && crt->version != 0 )
     {
         if( p - buf > 4096 )
             break;