diff --git a/roles/network/templates/network/dnsmasq.conf.j2 b/roles/network/templates/network/dnsmasq.conf.j2
index f346cb616..282c0b222 100644
--- a/roles/network/templates/network/dnsmasq.conf.j2
+++ b/roles/network/templates/network/dnsmasq.conf.j2
@@ -4,8 +4,10 @@ bogus-priv
 #server=/{{ iiab_domain }}/{{ iiab_hostname }}
 # Add local-only domains here, queries in these domains are answered　from /etc/hosts or DHCP only.
 local=/{{ iiab_domain }}/
+{% if captive_portal_enabled == "True" %}
 # Make all host names resolve to the Raspberry Pi's IP address
-#address=/#/{{ lan_ip }}
+address=/#/{{ lan_ip }}
+{% endif %}
 # Specify the interface that will listen for DHCP and DNS requests
 interface={{ iiab_lan_iface }}
 # Set the domain for dnsmasq