diff --git a/src/kits/interface/Bitmap.cpp b/src/kits/interface/Bitmap.cpp
index 66035e3192..0cfffddfdc 100644
--- a/src/kits/interface/Bitmap.cpp
+++ b/src/kits/interface/Bitmap.cpp
@@ -979,6 +979,8 @@ BBitmap::_InitObject(BRect bounds, color_space colorSpace, uint32 flags,
 					// the base pointer will now point to an overlay_client_data structure
 					link.Read<int32>(&fBytesPerRow);
 					size = fBytesPerRow * (bounds.IntegerHeight() + 1);
+					// bytes_per_row might be modified to match hardware constraints
+					bytesPerRow = fBytesPerRow;
 				}
 
 				if (fServerArea >= B_OK) {