diff --git a/roles/zabbix_agent/defaults/main.yml b/roles/zabbix_agent/defaults/main.yml
index 898d6a0..d0b2a63 100644
--- a/roles/zabbix_agent/defaults/main.yml
+++ b/roles/zabbix_agent/defaults/main.yml
@@ -13,6 +13,7 @@ zabbix_agent_server_active: []
 
 zabbix_agent_base_conf:
   PidFile: /var/run/zabbix/zabbix_agentd.pid
+  ControlSocket: /var/run/zabbix/zabbix_agent2.sock
   LogType: system
   Server: "{{ zabbix_agent_servers | join(',') }}"
   ListenPort: "{{ zabbix_agent_port }}"
diff --git a/roles/zabbix_agent/templates/zabbix_agentd.conf.j2 b/roles/zabbix_agent/templates/zabbix_agentd.conf.j2
index 33d12d3..6c177bb 100644
--- a/roles/zabbix_agent/templates/zabbix_agentd.conf.j2
+++ b/roles/zabbix_agent/templates/zabbix_agentd.conf.j2
@@ -1,6 +1,8 @@
 {% for key in zabbix_agent_conf.keys() | list %}
 {% if zabbix_agent2 and key in ['StartAgents'] %}
 # Ignoring directive {{ key }}={{ zabbix_agent_conf[key] }} as it's not supported in agent2
+{% elif not zabbix_agent2 and key in ['ControlSocket'] %}
+# Ignoring directive {{ key }}={{ zabbix_agent_conf[key] }} as it's not supported in agent
 {% else %}
 {% if not zabbix_agent_conf[key] is string and zabbix_agent_conf[key] is iterable %}
 {% for x in zabbix_agent_conf[key] %}