diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index 87eeee2d..47eed678 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -238,6 +238,14 @@ int _mosquitto_socket_close(struct mosquitto *mosq)
 #endif
 	}
 
+#ifdef WITH_WEBSOCKETS
+	if(!mosq->wsi){
+#endif
+		HASH_ADD_KEYPTR(hh_for_free, db->contexts_for_free, mosq, sizeof(void *), mosq);
+#ifdef WITH_WEBSOCKETS
+	}
+#endif
+
 #ifdef WITH_BROKER
 	if(mosq->listener){
 		mosq->listener->client_count--;