diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 52dda37f6d..c3be69b928 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -441,9 +441,9 @@ int ssl3_connect(SSL *s)
 		skip=0;
 		}
 end:
+	s->in_handshake--;
 	if (cb != NULL)
 		cb(s,SSL_CB_CONNECT_EXIT,ret);
-	s->in_handshake--;
 	return(ret);
 	}
 
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 8c5b6e8c9c..72a73cd9d0 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -573,9 +573,9 @@ int ssl3_accept(SSL *s)
 end:
 	/* BIO_flush(s->wbio); */
 
+	s->in_handshake--;
 	if (cb != NULL)
 		cb(s,SSL_CB_ACCEPT_EXIT,ret);
-	s->in_handshake--;
 	return(ret);
 	}