diff --git a/mopidy/frontends/mpd/server.py b/mopidy/frontends/mpd/server.py
index 927e2a00..b3aa0481 100644
--- a/mopidy/frontends/mpd/server.py
+++ b/mopidy/frontends/mpd/server.py
@@ -21,7 +21,6 @@ class MpdServer(asyncore.dispatcher):
         """Start MPD server."""
         try:
             self.socket = network.create_socket()
-            self.set_reuse_addr()
             hostname = network.format_hostname(settings.MPD_SERVER_HOSTNAME)
             port = settings.MPD_SERVER_PORT
             logger.debug(u'MPD server is binding to [%s]:%s', hostname, port)
diff --git a/mopidy/utils/network.py b/mopidy/utils/network.py
index 1dedf7d7..80a51c77 100644
--- a/mopidy/utils/network.py
+++ b/mopidy/utils/network.py
@@ -27,6 +27,7 @@ def create_socket():
         sock.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
     else:
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     return sock
 
 def format_hostname(hostname):