diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c
index 1cb93d925..5e97c5eeb 100644
--- a/src/main/cms/cms.c
+++ b/src/main/cms/cms.c
@@ -990,7 +990,11 @@ void cmsUpdate(uint32_t currentTimeUs)
             lastCmsHeartBeatMs = currentTimeMs;
         }
     }
-    lastCalledMs = currentTimeMs;
+
+    // Some key (command), notably flash erase, takes too long to use the
+    // currentTimeMs to be used as lastCalledMs (freezes CMS for a minute or so
+    // if used).
+    lastCalledMs = millis();
 }
 
 void cmsHandler(timeUs_t currentTimeUs)