diff --git a/src/tcp_act.c b/src/tcp_act.c
index a88fab4af..cef2e50d3 100644
--- a/src/tcp_act.c
+++ b/src/tcp_act.c
@@ -520,10 +520,16 @@ static int tcp_check_attach_srv(struct act_rule *rule, struct proxy *px, char **
 		return 0;
 	}
 
-	if ((rule->arg.attach_srv.name && (!srv->use_ssl || !srv->sni_expr)) ||
-	    (!rule->arg.attach_srv.name && srv->use_ssl && srv->sni_expr)) {
-		memprintf(err, "attach-srv rule: connection will never be used; either specify name argument in conjunction with defined SSL SNI on targeted server or none of these");
-		return 0;
+	if (rule->arg.attach_srv.name) {
+		if (!srv->sni_expr) {
+			memprintf(err, "attach-srv rule has a name argument while server '%s/%s' does not have an sni argument; either add a sni argument to the server or remove the name argument from this attach-srv rule", ist0(be_name), ist0(sv_name));
+			return 0;
+		}
+	} else {
+		if (srv->sni_expr) {
+			memprintf(err, "attach-srv rule has no name argument while server '%s/%s' has an sni argument; either add a name argument to the attach-srv rule or remove the sni argument from the server", ist0(be_name), ist0(sv_name));
+			return 0;
+		}
 	}
 
 	rule->arg.attach_srv.srv = srv;