diff --git a/src/loop.c b/src/loop.c
index 5044e7c895..2a5a63ebb2 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -285,6 +285,7 @@ void do_disconnect(struct mosquitto *context, int reason)
 #endif
 
 	if(context->state == mosq_cs_disconnected){
+		context__cleanup(context, true);
 		return;
 	}
 #ifdef WITH_WEBSOCKETS