diff --git a/src/filters/hue_saturation_filter.cpp b/src/filters/hue_saturation_filter.cpp
index 0a8c7ca52..64be3ff48 100644
--- a/src/filters/hue_saturation_filter.cpp
+++ b/src/filters/hue_saturation_filter.cpp
@@ -63,9 +63,9 @@ void HueSaturationFilter::applyToRgba(FilterManager* filterMgr)
 
   if (filterMgr->isFirstRow()) {
     m_picks = fid->getPalettePicks();
-    if (m_picks.picks() > 0) {
+    m_usePalette = (m_picks.picks() > 0);
+    if (m_usePalette)
       applyToPalette(filterMgr);
-    }
   }
 
   const Palette* pal = fid->getPalette();
@@ -83,7 +83,7 @@ void HueSaturationFilter::applyToRgba(FilterManager* filterMgr)
 
     color_t c = *(src_address++);
 
-    if (m_picks.picks() > 0) {
+    if (m_usePalette) {
       int i =
         pal->findExactMatch(rgba_getr(c),
                             rgba_getg(c),
diff --git a/src/filters/hue_saturation_filter.h b/src/filters/hue_saturation_filter.h
index 98d27d2db..d191c5848 100644
--- a/src/filters/hue_saturation_filter.h
+++ b/src/filters/hue_saturation_filter.h
@@ -37,6 +37,7 @@ namespace filters {
     double m_h, m_s, m_l;
     int m_a;
     doc::PalettePicks m_picks;
+    bool m_usePalette;
   };
 
 } // namespace filters