diff --git a/reactos/lib/setupapi/devinst.c b/reactos/lib/setupapi/devinst.c
index 587b45836b3..3c9c42568d2 100644
--- a/reactos/lib/setupapi/devinst.c
+++ b/reactos/lib/setupapi/devinst.c
@@ -2383,7 +2383,10 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(
                     *RequiredSize = BufferSize;
                 switch(rc) {
                     case ERROR_SUCCESS:
-                        ret = TRUE;
+                        if (PropertyBuffer != NULL || BufferSize == 0)
+                            ret = TRUE;
+                        else
+                            SetLastError(ERROR_INSUFFICIENT_BUFFER);
                         break;
                     case ERROR_MORE_DATA:
                         SetLastError(ERROR_INSUFFICIENT_BUFFER);