diff --git a/Components/FileSystem/Source/fs_fat.c b/Components/FileSystem/Source/fs_fat.c
index cde7a890..093ff76b 100644
--- a/Components/FileSystem/Source/fs_fat.c
+++ b/Components/FileSystem/Source/fs_fat.c
@@ -5792,7 +5792,7 @@ __WEAK fsStatus fat_ffind (const char *fn, fsFileInfo *info, fsFAT_Volume *vol)
       /* Explicit search without wildcard */
       if (info->fileID != 0) {
         /* We found this file already in the previous iteration */
-        return (fsError);
+        return (fsFileNotFound);
       }
       /* Copy name from path information */
       memcpy (info->name, pinfo.fn, pinfo.fn_len);
diff --git a/Documentation/Doxygen/FileSystem/src/fs_rev_hist.md b/Documentation/Doxygen/FileSystem/src/fs_rev_hist.md
index 5f309840..a9975b65 100644
--- a/Documentation/Doxygen/FileSystem/src/fs_rev_hist.md
+++ b/Documentation/Doxygen/FileSystem/src/fs_rev_hist.md
@@ -15,6 +15,7 @@
         - removed support for legacy fdelete function
         - fixed allocation table write access (regression) when using FAT12
         - fixed FAT volume label character checking
+        - corrected ffind error code for FAT on repeated search without wildcard
       </td>
     </tr>
     <tr>
diff --git a/Keil.MDK-Middleware.pdsc b/Keil.MDK-Middleware.pdsc
index 04c9bfa2..5a8c9257 100644
--- a/Keil.MDK-Middleware.pdsc
+++ b/Keil.MDK-Middleware.pdsc
@@ -36,6 +36,7 @@
       - removed support for legacy fdelete function
       - fixed allocation table write access (regression) when using FAT12
       - fixed FAT volume label character checking
+      - corrected ffind error code for FAT on repeated search without wildcard
       USB Component Version 8.0.0
       - removed CORE component variants
       - changed source config files to headers