diff --git a/libs/libc/stream/lib_blkoutstream.c b/libs/libc/stream/lib_blkoutstream.c
index ee973481bb5..793a0fe1d8f 100644
--- a/libs/libc/stream/lib_blkoutstream.c
+++ b/libs/libc/stream/lib_blkoutstream.c
@@ -239,18 +239,18 @@ void lib_blkoutstream_close(FAR struct lib_blkoutstream_s *stream)
 {
   if (stream != NULL)
     {
-      if (stream->inode != NULL)
-        {
-          close_blockdriver(stream->inode);
-          stream->inode = NULL;
-        }
-
       if (stream->cache != NULL)
         {
           blkoutstream_flush(&stream->common);
           lib_free(stream->cache);
           stream->cache = NULL;
         }
+
+      if (stream->inode != NULL)
+        {
+          close_blockdriver(stream->inode);
+          stream->inode = NULL;
+        }
     }
 }
 
diff --git a/libs/libc/stream/lib_mtdoutstream.c b/libs/libc/stream/lib_mtdoutstream.c
index 138e9f985e3..c9a42a687c1 100644
--- a/libs/libc/stream/lib_mtdoutstream.c
+++ b/libs/libc/stream/lib_mtdoutstream.c
@@ -267,18 +267,18 @@ void lib_mtdoutstream_close(FAR struct lib_mtdoutstream_s *stream)
 {
   if (stream != NULL)
     {
-      if (stream->inode != NULL)
-        {
-          close_mtddriver(stream->inode);
-          stream->inode = NULL;
-        }
-
       if (stream->cache != NULL)
         {
           mtdoutstream_flush(&stream->common);
           lib_free(stream->cache);
           stream->cache = NULL;
         }
+
+      if (stream->inode != NULL)
+        {
+          close_mtddriver(stream->inode);
+          stream->inode = NULL;
+        }
     }
 }
 
diff --git a/libs/libc/stream/lib_mtdsostream.c b/libs/libc/stream/lib_mtdsostream.c
index 262fdd70e1b..52e2221aa84 100644
--- a/libs/libc/stream/lib_mtdsostream.c
+++ b/libs/libc/stream/lib_mtdsostream.c
@@ -277,18 +277,18 @@ void lib_mtdsostream_close(FAR struct lib_mtdsostream_s *stream)
 {
   if (stream != NULL)
     {
-      if (stream->inode != NULL)
-        {
-          close_mtddriver(stream->inode);
-          stream->inode = NULL;
-        }
-
       if (stream->cache != NULL)
         {
           mtdsostream_flush(&stream->common);
           lib_free(stream->cache);
           stream->cache = NULL;
         }
+
+      if (stream->inode != NULL)
+        {
+          close_mtddriver(stream->inode);
+          stream->inode = NULL;
+        }
     }
 }