diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
index 31d25d190d2..7bd89bab4ff 100644
--- a/neutron/agent/linux/dhcp.py
+++ b/neutron/agent/linux/dhcp.py
@@ -643,21 +643,20 @@ class Dnsmasq(DhcpLocalProcess):
             timestamp = 0
         else:
             timestamp = int(time.time()) + self.conf.dhcp_lease_duration
-        dhcp_enabled_subnet_ids = [s.id for s in
-                                   self._get_all_subnets(self.network)
-                                   if s.enable_dhcp]
+        dhcpv4_enabled_subnet_ids = [
+            s.id for s in self._get_all_subnets(self.network)
+            if s.enable_dhcp and s.ip_version == constants.IP_VERSION_4]
         for host_tuple in self._iter_hosts():
             port, alloc, hostname, name, no_dhcp, no_opts = host_tuple
             # don't write ip address which belongs to a dhcp disabled subnet
-            # or an IPv6 SLAAC/stateless subnet
-            if no_dhcp or alloc.subnet_id not in dhcp_enabled_subnet_ids:
+            # or an IPv6 subnet.
+            if no_dhcp or alloc.subnet_id not in dhcpv4_enabled_subnet_ids:
                 continue
 
-            ip_address = self._format_address_for_dnsmasq(alloc.ip_address)
             # all that matters is the mac address and IP. the hostname and
             # client ID will be overwritten on the next renewal.
             buf.write('%s %s %s * *\n' %
-                      (timestamp, port.mac_address, ip_address))
+                      (timestamp, port.mac_address, alloc.ip_address))
         contents = buf.getvalue()
         file_utils.replace_file(filename, contents)
         LOG.debug('Done building initial lease file %s with contents:\n%s',
diff --git a/neutron/tests/unit/agent/linux/test_dhcp.py b/neutron/tests/unit/agent/linux/test_dhcp.py
index 736458df438..34ea174d357 100644
--- a/neutron/tests/unit/agent/linux/test_dhcp.py
+++ b/neutron/tests/unit/agent/linux/test_dhcp.py
@@ -1433,9 +1433,7 @@ class TestDnsmasq(TestBase):
     def _test_output_init_lease_file(self, timestamp):
         expected = [
             '00:00:80:aa:bb:cc 192.168.0.2 * *',
-            '00:00:f3:aa:bb:cc [fdca:3ba5:a17a:4ba3::2] * *',
             '00:00:0f:aa:bb:cc 192.168.0.3 * *',
-            '00:00:0f:aa:bb:cc [fdca:3ba5:a17a:4ba3::3] * *',
             '00:00:0f:rr:rr:rr 192.168.0.1 * *\n']
         expected = "\n".join(['%s %s' % (timestamp, l) for l in expected])
         with mock.patch.object(dhcp.Dnsmasq, 'get_conf_file_name') as conf_fn: