diff --git a/apps/db_dump/stubs.c b/apps/db_dump/stubs.c
index 8cc90a78..5fb08a8c 100644
--- a/apps/db_dump/stubs.c
+++ b/apps/db_dump/stubs.c
@@ -38,6 +38,11 @@ enum mosquitto_client_state mosquitto__get_state(struct mosquitto *mosq)
 	return mosq_cs_new;
 }
 
+int mux__add_out(struct mosquitto *mosq)
+{
+	return 0;
+}
+
 int mux__remove_out(struct mosquitto *mosq)
 {
 	return 0;
diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
index 8b57a4f2..2d30f7e8 100644
--- a/lib/mosquitto_internal.h
+++ b/lib/mosquitto_internal.h
@@ -350,9 +350,7 @@ struct mosquitto {
 	struct session_expiry_list *expiry_list_item;
 	uint16_t remote_port;
 #endif
-#ifdef WITH_EPOLL
 	uint32_t events;
-#endif
 };
 
 #define STREMPTY(str) (str[0] == '\0')
diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c
index d2127d30..e576c67c 100644
--- a/lib/packet_mosq.c
+++ b/lib/packet_mosq.c
@@ -164,7 +164,6 @@ int packet__queue(struct mosquitto *mosq, struct mosquitto__packet *packet)
 		lws_callback_on_writable(mosq->wsi);
 		return MOSQ_ERR_SUCCESS;
 	}else{
-		mux__add_out(mosq);
 		return packet__write(mosq);
 	}
 #  else
@@ -216,6 +215,10 @@ int packet__write(struct mosquitto *mosq)
 	if(!mosq) return MOSQ_ERR_INVAL;
 	if(mosq->sock == INVALID_SOCKET) return MOSQ_ERR_NO_CONN;
 
+#ifdef WITH_BROKER
+	mux__add_out(mosq);
+#endif
+
 	pthread_mutex_lock(&mosq->current_out_packet_mutex);
 	pthread_mutex_lock(&mosq->out_packet_mutex);
 	if(mosq->out_packet && !mosq->current_out_packet){