diff --git a/src/include/platform/FailSafeContext.h b/src/include/platform/FailSafeContext.h
index aa00d8e9f7ce34..6c476972cf9304 100644
--- a/src/include/platform/FailSafeContext.h
+++ b/src/include/platform/FailSafeContext.h
@@ -73,7 +73,6 @@ class FailSafeContext
 
     inline FabricIndex GetFabricIndex()
     {
-        VerifyOrDie(mFailSafeArmed);
         return mFabricIndex;
     }
 
diff --git a/src/platform/FailSafeContext.cpp b/src/platform/FailSafeContext.cpp
index c13befbb6d39c6..5373b1b4941e35 100644
--- a/src/platform/FailSafeContext.cpp
+++ b/src/platform/FailSafeContext.cpp
@@ -44,9 +44,7 @@ void FailSafeContext::CommissioningFailedTimerComplete()
     event.CommissioningComplete.Status          = CHIP_ERROR_TIMEOUT;
     CHIP_ERROR status                           = PlatformMgr().PostEvent(&event);
 
-    mFailSafeArmed                  = false;
-    mAddNocCommandHasBeenInvoked    = false;
-    mUpdateNocCommandHasBeenInvoked = false;
+    mFailSafeArmed = false;
 
     if (status != CHIP_NO_ERROR)
     {