diff --git a/ChangeLog.txt b/ChangeLog.txt
index 622eaf33..2ed754ea 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -73,6 +73,8 @@ Broker fixes:
 - Fix CONNACK message not being sent for unauthorised connect on websockets.
   Closes #8.
 - Maximum connections on Windows increased to 2048.
+- When a client with an in-use client-id connects, if the old client has a
+  will, send the will message. Closes #26.
 
 Client library features:
 - Outgoing messages with QoS>1 are no longer retried after a timeout period.
diff --git a/src/handle_connect.c b/src/handle_connect.c
index c6f0e96a..3411dd23 100644
--- a/src/handle_connect.c
+++ b/src/handle_connect.c
@@ -558,7 +558,6 @@ int handle__connect(struct mosquitto_db *db, struct mosquitto *context)
 		}
 
 		found_context->clean_session = true;
-		found_context->state = mosq_cs_disconnecting;
 		do_disconnect(db, found_context);
 	}