diff --git a/mopidy/utils/zeroconf.py b/mopidy/utils/zeroconf.py
index c1781867..33fbd13b 100644
--- a/mopidy/utils/zeroconf.py
+++ b/mopidy/utils/zeroconf.py
@@ -1,11 +1,10 @@
 from __future__ import unicode_literals
 
 import logging
-import re
 import socket
 import string
 
-logger = logging.getLogger('mopidy.utils.zerconf')
+logger = logging.getLogger('mopidy.utils.zeroconf')
 
 try:
     import dbus
@@ -17,13 +16,6 @@ _AVAHI_PROTO_UNSPEC = -1
 _AVAHI_PUBLISHFLAGS_NONE = 0
 
 
-def _filter_loopback_and_meta_addresses(host):
-    # TODO: see if we can find a cleaner way of handling this.
-    if re.search(r'(?<![.\d])(127|0)[.]', host):
-        return ''
-    return host
-
-
 def _convert_text_to_dbus_bytes(text):
     return [dbus.Byte(ord(c)) for c in text]
 
@@ -38,7 +30,10 @@ class Zeroconf(object):
         self.domain = domain or ''
         self.port = port
         self.text = text or []
-        self.host = _filter_loopback_and_meta_addresses(host or '')
+        if host in ('::', '0.0.0.0'):
+            self.host = ''
+        else:
+            self.host = host
 
         template = string.Template(name)
         self.name = template.safe_substitute(
@@ -51,31 +46,38 @@ class Zeroconf(object):
 
         try:
             bus = dbus.SystemBus()
+
+            if not bus.name_has_owner('org.freedesktop.Avahi'):
+                logger.debug(
+                    'Zeroconf publish failed: Avahi service not running.')
+                return False
+
+            server = dbus.Interface(
+                bus.get_object('org.freedesktop.Avahi', '/'),
+                'org.freedesktop.Avahi.Server')
+
+            self.group = dbus.Interface(
+                bus.get_object(
+                    'org.freedesktop.Avahi', server.EntryGroupNew()),
+                'org.freedesktop.Avahi.EntryGroup')
+
+            text = [_convert_text_to_dbus_bytes(t) for t in self.text]
+            self.group.AddService(
+                _AVAHI_IF_UNSPEC, _AVAHI_PROTO_UNSPEC,
+                dbus.UInt32(_AVAHI_PUBLISHFLAGS_NONE), self.name, self.stype,
+                self.domain, self.host, dbus.UInt16(self.port), text)
+
+            self.group.Commit()
+            return True
         except dbus.exceptions.DBusException as e:
             logger.debug('Zeroconf publish failed: %s', e)
             return False
 
-        if not bus.name_has_owner('org.freedesktop.Avahi'):
-            logger.debug('Zeroconf publish failed: Avahi service not running.')
-            return False
-
-        server = dbus.Interface(bus.get_object('org.freedesktop.Avahi', '/'),
-                                'org.freedesktop.Avahi.Server')
-
-        self.group = dbus.Interface(
-            bus.get_object('org.freedesktop.Avahi', server.EntryGroupNew()),
-            'org.freedesktop.Avahi.EntryGroup')
-
-        text = [_convert_text_to_dbus_bytes(t) for t in self.text]
-        self.group.AddService(_AVAHI_IF_UNSPEC, _AVAHI_PROTO_UNSPEC,
-                              dbus.UInt32(_AVAHI_PUBLISHFLAGS_NONE),
-                              self.name, self.stype, self.domain, self.host,
-                              dbus.UInt16(self.port), text)
-
-        self.group.Commit()
-        return True
-
     def unpublish(self):
         if self.group:
-            self.group.Reset()
-            self.group = None
+            try:
+                self.group.Reset()
+            except dbus.exceptions.DBusException as e:
+                logger.debug('Zeroconf unpublish failed: %s', e)
+            finally:
+                self.group = None