diff --git a/common/rfb/ScaledPixelBuffer.cxx b/common/rfb/ScaledPixelBuffer.cxx
index 35d5d3b..c30e93d 100644
--- a/common/rfb/ScaledPixelBuffer.cxx
+++ b/common/rfb/ScaledPixelBuffer.cxx
@@ -91,11 +91,11 @@
 
   scaleFilterID = scaleFilterID_;
   
-  if (src_width && src_height && scaled_width && scaled_height && pf.depth > 0) {
+  if (src_width && src_height && scaled_width && scaled_height) {
     freeWeightTabs();
     scaleFilters.makeWeightTabs(scaleFilterID, src_width, scaled_width, &xWeightTabs);
     scaleFilters.makeWeightTabs(scaleFilterID, src_height, scaled_height, &yWeightTabs);
-    if (scale != 100) scaleRect(Rect(0, 0, src_width, src_height));
+    if (scale != 100 && pf.depth > 0) scaleRect(Rect(0, 0, src_width, src_height));
   }
 }
 
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 4a9b341..53a16d0 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -158,6 +158,7 @@
     window->setDisableWinKeys(options.disableWinKeys);
     window->setShowToolbar(options.showToolbar);
     window->printScale();
+    window->setDesktopScaleFilter(options.scaleFilter);
     if (options.autoScaling) {
       window->setAutoScaling(true);
     } else {