diff --git a/src/common/server.c b/src/common/server.c
index 62ba9540..8ff81553 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -487,6 +487,10 @@ ssl_do_connect (server * serv)
 	char buf[128];
 
 	g_sess = serv->server_session;
+
+	/* Set SNI hostname before connect */
+	SSL_set_tlsext_host_name(serv->ssl, serv->hostname);
+
 	if (SSL_connect (serv->ssl) <= 0)
 	{
 		char err_buf[128];