diff --git a/drivers/rwbuffer.c b/drivers/rwbuffer.c
index 45a7aa5b420..106592ab9b4 100644
--- a/drivers/rwbuffer.c
+++ b/drivers/rwbuffer.c
@@ -880,6 +880,7 @@ void rwb_uninitialize(FAR struct rwbuffer_s *rwb)
   if (rwb->wrmaxblocks > 0)
     {
       rwb_wrcanceltimeout(rwb);
+      rwb_wrflush(rwb);
       nxsem_destroy(&rwb->wrsem);
       if (rwb->wrbuffer)
         {