1 files changed, 4 insertions, 2 deletions

diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index f301a9a4d..34e4a3681 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -4818,8 +4818,10 @@ queue_add (void *cls, uint16_t type, size_t size,
   i = (cinfo->send_buffer_start + cinfo->send_buffer_n) % t->fwd_queue_max;
   if (NULL != cinfo->send_buffer[i])
   {
-    queue_destroy(cinfo->send_buffer[i], GNUNET_YES);
-    GNUNET_break (cinfo->send_buffer_n > 0);
+    GNUNET_break (cinfo->send_buffer_n == t->fwd_queue_max); // aka i == start
+    queue_destroy(cinfo->send_buffer[cinfo->send_buffer_start], GNUNET_YES);
+    cinfo->send_buffer_start++;
+    cinfo->send_buffer_start %= t->fwd_queue_max;
     cinfo->send_buffer_n--;
   }
   cinfo->send_buffer[i] = queue;