diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c
index 438521f69e9..22acb77b076 100644
--- a/win32ss/gdi/gdi32/objects/bitmap.c
+++ b/win32ss/gdi/gdi32/objects/bitmap.c
@@ -750,6 +750,10 @@ SetDIBitsToDevice(
             // space.....
             DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %p or Bits: %p & Size: %u\n",
                 pConvertedInfo, Bits, cjBmpScanSize);
+            // The caller is just sending "just enough" data, setting ScanLines as Height
+               ScanLines = Height;
+               cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO) lpbmi, ScanLines);
+               RtlCopyMemory(pvSafeBits, Bits, cjBmpScanSize);
         }
         DPRINT("SetDIBitsToDevice Allocate Bits %u!!!\n", cjBmpScanSize);
     }