diff --git a/common/rfb/JpegCompressor.cxx b/common/rfb/JpegCompressor.cxx
index 33f6c41..0ed5cb5 100644
--- a/common/rfb/JpegCompressor.cxx
+++ b/common/rfb/JpegCompressor.cxx
@@ -169,7 +169,7 @@
   }
 #endif
 
-  if (pitch == 0) pitch = w * pixelsize;
+  if (pitch == 0) pitch = w * pf.bpp / 8;
 
   if (cinfo.in_color_space == JCS_RGB) {
     srcBuf = new rdr::U8[w * h * pixelsize];