diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
index b8a22586..86015fa1 100644
--- a/lib/mosquitto_internal.h
+++ b/lib/mosquitto_internal.h
@@ -94,6 +94,7 @@ enum mosquitto_client_state {
 	mosq_cs_socks5_auth_ok = 12,
 	mosq_cs_socks5_userpass_reply = 13,
 	mosq_cs_socks5_send_userpass = 14,
+	mosq_cs_expiring = 15,
 };
 
 enum _mosquitto_protocol {
diff --git a/src/loop.c b/src/loop.c
index c9d2b95b..088c33fc 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -258,6 +258,7 @@ int mosquitto_main_loop(struct mosquitto_db *db, int *listensock, int listensock
 						g_clients_expired++;
 #endif
 						context->clean_session = true;
+						context->state = mosq_cs_expiring;
 						do_disconnect(db, context);
 					}
 				}