diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c
index e4779e89088..a5012b0db46 100644
--- a/src/zabbix_proxy/proxy.c
+++ b/src/zabbix_proxy/proxy.c
@@ -576,10 +576,15 @@ static void	zbx_set_defaults(void)
 	{
 		config_server_port = ZBX_DEFAULT_SERVER_PORT;
 	}
-	else
+	else if (ZBX_PROXYMODE_PASSIVE == config_proxymode)
+	{
+		zabbix_log(LOG_LEVEL_WARNING, "ServerPort parameter is deprecated,"
+				" besides, it is ignored in passive proxy mode");
+	}
+	else if (ZBX_PROXYMODE_ACTIVE == config_proxymode)
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "ServerPort parameter is deprecated,"
-					" please specify port in Server parameter separated by ':' instead");
+				" please specify port in Server parameter separated by ':' instead");
 	}
 }
 
@@ -632,7 +637,8 @@ static void	zbx_validate_config(ZBX_TASK_EX *task)
 	else if (ZBX_PROXYMODE_PASSIVE == config_proxymode && FAIL == zbx_validate_peer_list(config_server,
 			&ch_error))
 	{
-		zabbix_log(LOG_LEVEL_CRIT, "invalid entry in \"Server\" configuration parameter: %s", ch_error);
+		zabbix_log(LOG_LEVEL_CRIT, "unexpected \"Server\" configuration parameter value %s, in passive mode it"
+				" can only contain comma-separated list of peers", ch_error);
 		zbx_free(ch_error);
 		err = 1;
 	}