diff --git a/reactos/drivers/filesystems/fastfat/dir.c b/reactos/drivers/filesystems/fastfat/dir.c
index e94546e6657..4f81d86f4a4 100644
--- a/reactos/drivers/filesystems/fastfat/dir.c
+++ b/reactos/drivers/filesystems/fastfat/dir.c
@@ -433,7 +433,7 @@ static NTSTATUS DoQuery (PVFAT_IRP_CONTEXT IrpContext)
              default:
                RC = STATUS_INVALID_INFO_CLASS;
 	    }
-          if (RC == STATUS_BUFFER_OVERFLOW)
+          if (RC == STATUS_BUFFER_OVERFLOW || RC == STATUS_INVALID_INFO_CLASS)
             {
               break;
             }