1 files changed, 5 insertions, 1 deletions

diff --git a/src/util/server.c b/src/util/server.c
index b1edf2c45..409e89f16 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -1396,7 +1396,11 @@ GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client)
     GNUNET_SCHEDULER_cancel (client->warn_task);
     client->warn_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  GNUNET_assert (GNUNET_NO == client->receive_pending);
+  if (GNUNET_YES == client->receive_pending)
+  {
+    GNUNET_CONNECTION_receive_cancel (client->connection);
+    client->receive_pending = GNUNET_NO;
+  }
   GNUNET_free (client);
   /* we might be in soft-shutdown, test if we're done */
   if (NULL != server)