diff --git a/sa_core.c b/sa_core.c
index d7671bb..7aaf4f1 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -1117,9 +1117,10 @@ void set_average(int v)
       && (v != AV_QUASI)
 #endif
       );
-  if (enable)
+  if (enable) {
     enableTracesAtComplete(TRACE_TEMP_FLAG);
-  else
+    scan_after_dirty = 0;
+  } else
     TRACE_DISABLE(TRACE_TEMP_FLAG);
   //dirty = true;             // No HW update required, only status panel refresh
 }