diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 17d18d42..bdbb6666 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -367,6 +367,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int hash_messa
 			goto f_err;
 			}
 		*ok=1;
+		s->state = stn;
 		s->init_msg = (uint8_t*)s->init_buf->data + 4;
 		s->init_num = (int)s->s3->tmp.message_size;
 		return s->init_num;