diff --git a/src/platform/FailSafeContext.cpp b/src/platform/FailSafeContext.cpp index 361ebb55f4df3a..5000dd92c9d9ed 100644 --- a/src/platform/FailSafeContext.cpp +++ b/src/platform/FailSafeContext.cpp @@ -188,8 +188,11 @@ CHIP_ERROR FailSafeContext::DeleteFromStorage() void FailSafeContext::ForceFailSafeTimerExpiry() { + if (!IsFailSafeArmed()) + { + return; + } FailSafeTimerExpired(); - DisarmFailSafe(); } } // namespace DeviceLayer