diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 01e2226f5..96fb576cc 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -459,7 +459,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
 
     readyphase++;
 
-    if (todo & M_AUTOEXP) {
+    if (todo & M_INIT) {
         if (params.toneCurve.autoexp) {
             LUTu aehist;
             int aehistcompr;
diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
index 30c9dadee..fff8c88db 100644
--- a/rtgui/tonecurve.cc
+++ b/rtgui/tonecurve.cc
@@ -30,7 +30,7 @@ using namespace rtengine::procparams;
 ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LABEL"))
 {
     auto m = ProcEventMapper::getInstance();
-    EvHistMatching = m->newEvent(AUTOEXP, "HISTORY_MSG_HISTMATCHING");
+    EvHistMatching = m->newEvent(ALLNORAW, "HISTORY_MSG_HISTMATCHING");
     EvHistMatchingBatch = m->newEvent(M_VOID, "HISTORY_MSG_HISTMATCHING");
     EvClampOOG = m->newEvent(DARKFRAME, "HISTORY_MSG_CLAMPOOG");