diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c
index b70ce809eb8..79d068ce106 100644
--- a/dlls/setupapi/query.c
+++ b/dlls/setupapi/query.c
@@ -168,7 +168,15 @@ BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION InfInformation,
         *RequiredSize = size;
 
     if (!ReturnBuffer)
+    {
+        if (ReturnBufferSize)
+        {
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;
+        }
+
         return TRUE;
+    }
 
     if (size > ReturnBufferSize)
     {