diff --git a/docs/changes.rst b/docs/changes.rst
index aae792fa..57224300 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -62,6 +62,12 @@ v0.8 (in development)
   properties may be left out if you don't want the mixer to adjust the settings
   on your NAD amplifier when Mopidy is started.
 
+- Fixed :issue:`150` which caused some clients to block Mopidy completely. Bug
+  was caused by some clients sending ``close`` and then shutting down the
+  connection right away. This trigged a situation in which the connection
+  cleanup code would wait for an response that would never come inside the
+  event loop, blocking everything else.
+
 
 v0.7.3 (2012-08-11)
 ===================
diff --git a/tests/utils/network/connection_test.py b/tests/utils/network/connection_test.py
index aa1be2b6..96ddb833 100644
--- a/tests/utils/network/connection_test.py
+++ b/tests/utils/network/connection_test.py
@@ -91,7 +91,7 @@ class ConnectionTest(unittest.TestCase):
         self.mock.sock = Mock(spec=socket.SocketType)
 
         network.Connection.stop(self.mock, sentinel.reason)
-        self.mock.actor_ref.stop.assert_called_once_with()
+        self.mock.actor_ref.stop.assert_called_once_with(block=False)
 
     def test_stop_handles_actor_already_being_stopped(self):
         self.mock.stopping = False
@@ -100,7 +100,7 @@ class ConnectionTest(unittest.TestCase):
         self.mock.sock = Mock(spec=socket.SocketType)
 
         network.Connection.stop(self.mock, sentinel.reason)
-        self.mock.actor_ref.stop.assert_called_once_with()
+        self.mock.actor_ref.stop.assert_called_once_with(block=False)
 
     def test_stop_sets_stopping_to_true(self):
         self.mock.stopping = False