diff --git a/src/kits/network/libnetapi/SecureSocket.cpp b/src/kits/network/libnetapi/SecureSocket.cpp
index f1447963d2..99136c742b 100644
--- a/src/kits/network/libnetapi/SecureSocket.cpp
+++ b/src/kits/network/libnetapi/SecureSocket.cpp
@@ -589,13 +589,11 @@ BSecureSocket::_SetupCommon(const char* host)
 	BIO_set_fd(fPrivate->fBIO, fSocket, BIO_NOCLOSE);
 	SSL_set_bio(fPrivate->fSSL, fPrivate->fBIO, fPrivate->fBIO);
 	SSL_set_ex_data(fPrivate->fSSL, Private::sDataIndex, this);
-	if (host != NULL) {
-		BString hostString = host;
-		if (hostString != "")
-			SSL_set_tlsext_host_name(fPrivate->fSSL, host);
+	if (host != NULL && host[0] != '\0') {
+		SSL_set_tlsext_host_name(fPrivate->fSSL, host);
+		X509_VERIFY_PARAM_set1_host(SSL_get0_param(fPrivate->fSSL), host, 0);
 	}
 
-
 	return B_OK;
 }