diff --git a/roles/inspircd/templates/etc/inspircd/inspircd.conf.2 b/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
index d3faecf..b0ddc8c 100644
--- a/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
+++ b/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
@@ -83,11 +83,12 @@
 {% for ac in inspircd_autoconnect %}
 <autoconnect
     {% if 'period' in ac %}period="{{ ac.period }}"{% endif %}
-    server="{{ ac.servers | join('') }}">
+    server="{{ ac.servers | select('ne', inspircd_server_hostname) | join(' ') }}">
 
 {% endfor %}
 
 {% for name, link in inspircd_links.items() %}
+{% if name != inspircd_server_hostname %}
 <link
     name="{{ name }}"
     ipaddr="{{ link.ipaddr }}"
@@ -101,6 +102,7 @@
     {% if 'ssl' in link %}ssl="{{ link.ssl }}"{% endif %}
     {% if 'statshidden' in link %}statshidden="{{ link.statshidden | ternary('yes', 'no') }}"{% endif %}
     {% if 'timeout' in link %}timeout="{{ link.timeout }}"{% endif %}>
+{% endif %}
 {% endfor %}
 
 {% for uline in inspircd_ulines %}