diff --git a/reactos/dll/win32/kernel32/client/file/rw.c b/reactos/dll/win32/kernel32/client/file/rw.c
index 20df0b1e5ab..ac676898dc3 100644
--- a/reactos/dll/win32/kernel32/client/file/rw.c
+++ b/reactos/dll/win32/kernel32/client/file/rw.c
@@ -131,7 +131,6 @@ ReadFile(IN HANDLE hFile,
     TRACE("ReadFile(hFile %p)\n", hFile);
 
     if (lpNumberOfBytesRead != NULL) *lpNumberOfBytesRead = 0;
-    if (!nNumberOfBytesToRead) return TRUE;
 
     hFile = TranslateStdHandle(hFile);
 
diff --git a/reactos/drivers/filesystems/fastfat/rw.c b/reactos/drivers/filesystems/fastfat/rw.c
index e9a23dbb9f9..b9fea99eb5c 100644
--- a/reactos/drivers/filesystems/fastfat/rw.c
+++ b/reactos/drivers/filesystems/fastfat/rw.c
@@ -924,6 +924,7 @@ VfatWrite(
     Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess);
     if (!NT_SUCCESS(Status))
     {
+        Status = STATUS_INVALID_USER_BUFFER;
         goto ByeBye;
     }