diff --git a/src/control.cc b/src/control.cc
index 149742a1..cc59d7a6 100644
--- a/src/control.cc
+++ b/src/control.cc
@@ -1153,6 +1153,7 @@ bool control_conn_t::queue_packet(const char *pkt, unsigned size) noexcept
     // Create a vector out of the (remaining part of the) packet:
     try {
         outbuf.emplace_back(pkt, pkt + size);
+        outbuf_size += size;
         return true;
     }
     catch (std::bad_alloc &baexc) {
@@ -1202,6 +1203,7 @@ bool control_conn_t::queue_packet(std::vector<char> &&pkt) noexcept
     
     try {
         outbuf.emplace_back(std::move(pkt));
+        outbuf_size += pkt.size();
         return true;
     }
     catch (std::bad_alloc &baexc) {
@@ -1290,6 +1292,7 @@ bool control_conn_t::send_data() noexcept
     outpkt_index += written;
     if (outpkt_index == pkt.size()) {
         // We've finished this packet, move on to the next:
+        outbuf_size -= pkt.size();
         outbuf.pop_front();
         outpkt_index = 0;
         if (oom_close) {
diff --git a/src/includes/control.h b/src/includes/control.h
index 30420f68..e61a4978 100644
--- a/src/includes/control.h
+++ b/src/includes/control.h
@@ -111,6 +111,8 @@ class control_conn_t : private service_listener
     
     // Buffer for outgoing packets. Each outgoing back is represented as a vector<char>.
     list<vector<char>> outbuf;
+    // Current output buffer size in bytes.
+    unsigned outbuf_size = 0;
     // Current index within the first outgoing packet (all previous bytes have been sent).
     unsigned outpkt_index = 0;
     
@@ -181,7 +183,7 @@ class control_conn_t : private service_listener
     bool data_ready() noexcept;
     
     bool send_data() noexcept;
-    
+
     // Check if any dependents will be affected by stopping a service, generate a response packet if so.
     // had_dependents will be set true if the service should not be stopped, false otherwise.
     // Returns false if the connection must be closed, true otherwise.
@@ -250,7 +252,7 @@ inline dasynq::rearm control_conn_cb(eventloop_t * loop, control_conn_watcher *
     }
     
     int watch_flags = 0;
-    if (!conn->bad_conn_close) {
+    if (!conn->bad_conn_close || conn->outbuf_size < 16384) {
         watch_flags |= dasynq::IN_EVENTS;
     }
     if (!conn->outbuf.empty() || conn->bad_conn_close) {