diff --git a/lib/roles/mqtt/mqtt.c b/lib/roles/mqtt/mqtt.c
index aaac84b8be..7ae7e677df 100644
--- a/lib/roles/mqtt/mqtt.c
+++ b/lib/roles/mqtt/mqtt.c
@@ -2325,7 +2325,7 @@ lws_mqtt_client_send_unsubcribe(struct lws *wsi,
 		for (n = 0; n < unsub->num_topics; n++) {
 			mysub = lws_mqtt_find_sub(nwsi->mqtt,
 						  unsub->topic[n].name);
-			assert(mysub);
+			//assert(mysub);
 
 			if (mysub && --mysub->ref_count == 0) {
 				lwsl_notice("%s: Need to send UNSUB\n", __func__);
diff --git a/lib/roles/mqtt/ops-mqtt.c b/lib/roles/mqtt/ops-mqtt.c
index ceac2f5788..4077b72586 100644
--- a/lib/roles/mqtt/ops-mqtt.c
+++ b/lib/roles/mqtt/ops-mqtt.c
@@ -552,6 +552,16 @@ rops_callback_on_writable_mqtt(struct lws *wsi)
 			)
 		return 1;
 
+	if (lws_check_opt(wsi->a.context->options, LWS_SERVER_OPTION_LIBUV)) {
+		if (network_wsi->mux_substream != 0)
+			network_wsi->mux_substream = 0;
+
+		lws_start_foreach_ll(struct lws *, w, network_wsi->mux.child_list) {
+			if (w->mux.requested_POLLOUT == 0)
+				w->mux.requested_POLLOUT = 1;
+		} lws_end_foreach_ll(w, mux.sibling_list);
+	}
+
 	return 0;
 }
 
@@ -562,6 +572,11 @@ rops_close_kill_connection_mqtt(struct lws *wsi, enum lws_close_status reason)
 			lws_wsi_tag(wsi),
 			lws_wsi_tag(wsi->mux.parent_wsi), wsi->mux.child_list);
 	//lws_wsi_mux_dump_children(wsi);
+	if (lws_check_opt(wsi->a.context->options, LWS_SERVER_OPTION_LIBUV)) {
+		struct lws *nwsi = lws_get_network_wsi(wsi);
+		if (nwsi->mux_substream == 0)
+			nwsi->mux_substream = 1;
+	}
 
 	if (wsi->mux_substream
 #if defined(LWS_WITH_CLIENT)