diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index cb27fc2b3..2118213d5 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -2878,7 +2878,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         keyFile.set_string("Version", "AppVersion", RTVERSION);
         keyFile.set_integer("Version", "Version", PPVERSION);
 
-        saveToKeyfile(!pedited || pedited->general.rank, "General", "Rank", rank, keyFile);
+        saveToKeyfile(!pedited || pedited->general.rank, "General", "Rank", std::max(rank, 0), keyFile);
         saveToKeyfile(!pedited || pedited->general.colorlabel, "General", "ColorLabel", colorlabel, keyFile);
         saveToKeyfile(!pedited || pedited->general.intrash, "General", "InTrash", inTrash, keyFile);
 
diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc
index 1ec10aacc..6ac3d629b 100644
--- a/rtgui/thumbnail.cc
+++ b/rtgui/thumbnail.cc
@@ -399,6 +399,7 @@ void Thumbnail::clearProcParams (int whoClearedIt)
 
         // and restore rank and inTrash
         setRank(rank);
+        pparamsValid = cfs.rating != rank;
         setColorLabel(colorlabel);
         setStage(inTrash);