diff --git a/NEWS b/NEWS
index 4351f3d99..64e2d0fbd 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ ver 0.19 (not yet released)
   - "list" on album artist falls back to the artist tag
   - "list" and "count" allow grouping
   - new "search"/"find" filter "modified-since"
+  - close connection after syntax error
 * database
   - proxy: forward "idle" events
   - proxy: forward the "update" command
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index d29950eeb..6a4b18198 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -369,7 +369,9 @@ command_process(Client &client, unsigned num, char *line)
 
 		current_command = nullptr;
 
-		return CommandResult::ERROR;
+		/* this client does not speak the MPD protocol; kick
+		   the connection */
+		return CommandResult::FINISH;
 	}
 
 	unsigned argc = 1;