diff --git a/ssl/tls_method.cc b/ssl/tls_method.cc
index 8aeb489..2dd27fc 100644
--- a/ssl/tls_method.cc
+++ b/ssl/tls_method.cc
@@ -92,14 +92,16 @@
   }
 
   OPENSSL_memset(ssl->s3->read_sequence, 0, sizeof(ssl->s3->read_sequence));
-
   ssl->s3->aead_read_ctx = std::move(aead_ctx);
   return true;
 }
 
 static bool ssl3_set_write_state(SSL *ssl, UniquePtr<SSLAEADContext> aead_ctx) {
-  OPENSSL_memset(ssl->s3->write_sequence, 0, sizeof(ssl->s3->write_sequence));
+  if (!tls_flush_pending_hs_data(ssl)) {
+    return false;
+  }
 
+  OPENSSL_memset(ssl->s3->write_sequence, 0, sizeof(ssl->s3->write_sequence));
   ssl->s3->aead_write_ctx = std::move(aead_ctx);
   return true;
 }