diff --git a/NEWS b/NEWS
index 58edf3f64..bd547f42f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ ver 0.19.17 (not yet released)
 * fix spurious seek error "Failed to allocate silence buffer"
 * replay gain: fix "replay_gain_handler mixer" setting
 * DSD: use 0x69 as silence pattern
-* fix use-after-free bug on "close"
+* fix use-after-free bug on "close" and "kill"
 
 ver 0.19.16 (2016/06/13)
 * faster seeking
diff --git a/src/client/ClientRead.cxx b/src/client/ClientRead.cxx
index 9cfb1271f..232da8d62 100644
--- a/src/client/ClientRead.cxx
+++ b/src/client/ClientRead.cxx
@@ -52,8 +52,8 @@ Client::OnSocketInput(void *data, size_t length)
 		break;
 
 	case CommandResult::KILL:
-		Close();
 		partition.instance.event_loop->Break();
+		Close();
 		return InputResult::CLOSED;
 
 	case CommandResult::FINISH: