diff --git a/source/common/tls/ssl_socket.cc b/source/common/tls/ssl_socket.cc
index c989d47cb255..9ffc2cb6ce5e 100644
--- a/source/common/tls/ssl_socket.cc
+++ b/source/common/tls/ssl_socket.cc
@@ -466,11 +466,9 @@ void SslSocket::onAsynchronousCertValidationComplete() {
 
 void SslSocket::onAsynchronousCertificateSelectionComplete() {
   ENVOY_CONN_LOG(debug, "Async cert selection completed", callbacks_->connection());
-  if (info_->state() != Ssl::SocketState::HandshakeBlockedOnAsyncOperation) {
-    IS_ENVOY_BUG(fmt::format("unexpected handshake state: {}", static_cast<int>(info_->state())));
-    return;
+  if (info_->state() == Ssl::SocketState::HandshakeBlockedOnAsyncOperation) {
+    resumeHandshake();
   }
-  resumeHandshake();
 }
 
 } // namespace Tls