diff --git a/src/spiffs_hydrogen.c b/src/spiffs_hydrogen.c
index bfeb3cf..7b3e0ae 100644
--- a/src/spiffs_hydrogen.c
+++ b/src/spiffs_hydrogen.c
@@ -1121,6 +1121,8 @@ struct spiffs_dirent *SPIFFS_readdir(spiffs_DIR *d, struct spiffs_dirent *e) {
     d->entry = entry + 1;
     e->obj_id &= ~SPIFFS_OBJ_ID_IX_FLAG;
     ret = e;
+  } else if (res == SPIFFS_VIS_END) {
+    // end of iteration
   } else {
     d->fs->err_code = res;
   }
diff --git a/src/test/test_hydrogen.c b/src/test/test_hydrogen.c
index 72aea74..84d3139 100644
--- a/src/test/test_hydrogen.c
+++ b/src/test/test_hydrogen.c
@@ -439,6 +439,7 @@ TEST(list_dir)
 #endif
     }
   }
+  TEST_CHECK_EQ(SPIFFS_errno(FS), SPIFFS_OK);
   SPIFFS_closedir(&d);
 
   TEST_CHECK(found == file_cnt);