diff --git a/src/credentials/FabricTable.h b/src/credentials/FabricTable.h
index de258545baef14..631f3cf5dc2ffc 100644
--- a/src/credentials/FabricTable.h
+++ b/src/credentials/FabricTable.h
@@ -42,12 +42,11 @@
 
 namespace chip {
 
-static constexpr FabricIndex kInvalidFabricIndex      = 0;
 static constexpr FabricIndex kMinValidFabricIndex     = 1;
 static constexpr FabricIndex kMaxValidFabricIndex     = std::min<FabricIndex>(UINT8_MAX - 1, CHIP_CONFIG_MAX_FABRICS);
 static constexpr uint8_t kFabricLabelMaxLengthInBytes = 32;
 
-static_assert(kInvalidFabricIndex < chip::kMinValidFabricIndex, "Invalid fabric index must be invalid");
+static_assert(kUndefinedFabricIndex < chip::kMinValidFabricIndex, "Undefined fabric index should not be valid");
 
 // KVS store is sensitive to length of key strings, based on the underlying
 // platform. Keeping them short.
diff --git a/src/transport/Session.h b/src/transport/Session.h
index 1e09b7c645ca4d..99be7b2315a65b 100644
--- a/src/transport/Session.h
+++ b/src/transport/Session.h
@@ -92,7 +92,7 @@ class Session
 
 private:
     IntrusiveList<SessionHolder> mHolders;
-    FabricIndex mFabricIndex = kInvalidFabricIndex;
+    FabricIndex mFabricIndex = kUndefinedFabricIndex;
 };
 
 } // namespace Transport