diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c
index ad2a3aae..84f93cb8 100644
--- a/lib/packet_mosq.c
+++ b/lib/packet_mosq.c
@@ -216,7 +216,9 @@ int packet__write(struct mosquitto *mosq)
 	if(mosq->sock == INVALID_SOCKET) return MOSQ_ERR_NO_CONN;
 
 #ifdef WITH_BROKER
-	mux__add_out(mosq);
+	if (mosq->current_out_packet) {
+	   mux__add_out(mosq);
+	}
 #endif
 
 	pthread_mutex_lock(&mosq->current_out_packet_mutex);