diff --git a/degesch.c b/degesch.c
index 0f46c83..18132a3 100644
--- a/degesch.c
+++ b/degesch.c
@@ -3980,11 +3980,13 @@ transport_tls_init (struct server *s, struct error **e)
 	if (!SSL_set_fd (ssl, s->socket))
 		goto error_ssl_3;
 
-	// XXX: maybe set `ssl_rx_want_tx' to force a handshake?
 	struct transport_tls_data *data = xcalloc (1, sizeof *data);
 	data->ssl_ctx = ssl_ctx;
 	data->ssl = ssl;
 
+	// Forces a handshake even if neither side wants to transmit data
+	data->ssl_rx_want_tx = true;
+
 	s->transport_data = data;
 	return true;