diff --git a/zabbix-agent/templates/zabbix_agentd.conf.j2 b/zabbix-agent/templates/zabbix_agentd.conf.j2
index d7cc1baafede72ff9df927b735aeb5269f481289..12400ddc4ea944c0ad45b9840faa259bce2c8f2d 100644
--- a/zabbix-agent/templates/zabbix_agentd.conf.j2
+++ b/zabbix-agent/templates/zabbix_agentd.conf.j2
@@ -92,7 +92,7 @@ EnableRemoteCommands=1
 # Default:
 # Server=
 
-Server={% for server in zabbixservers %}{{ server }}, {% endfor %}
+Server={{zabbixserver}}
 
 ### Option: ListenPort
 #	Agent will listen on this port for connections from the server.
@@ -133,7 +133,7 @@ Server={% for server in zabbixservers %}{{ server }}, {% endfor %}
 # Default:
 # ServerActive=
 
-ServerActive={% for server in zabbixservers %}{{ server }}, {% endfor %}
+ServerActive={{zabbixserver}}
 
 ### Option: Hostname
 #	Unique, case sensitive hostname.