diff --git a/server/core/dcb.c b/server/core/dcb.c
index 5740d4ffa..6c836a6fd 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -374,6 +374,11 @@ dcb_final_free(DCB *dcb)
 		GWBUF *queue = dcb->delayq;
 		while ((queue = gwbuf_consume(queue, GWBUF_LENGTH(queue))) != NULL);
 	}
+    if (dcb->writeq) {
+        GWBUF *queue = dcb->writeq;
+        while ((queue = gwbuf_consume(queue, GWBUF_LENGTH(queue))) != NULL);
+        dcb->writeq = NULL;
+    }
 	if (dcb->dcb_readqueue)
         {
                 GWBUF* queue = dcb->dcb_readqueue;
@@ -3141,4 +3146,4 @@ void dcb_log_ssl_read_error(DCB *dcb, int ssl_errno, int rc)
             }
         }
     }
-}
\ No newline at end of file
+}