diff --git a/src/controller/java/src/chip/devicecontroller/ICDDeviceInfo.java b/src/controller/java/src/chip/devicecontroller/ICDDeviceInfo.java
index 70cbeb61cff5f4..8e812ed94d602a 100644
--- a/src/controller/java/src/chip/devicecontroller/ICDDeviceInfo.java
+++ b/src/controller/java/src/chip/devicecontroller/ICDDeviceInfo.java
@@ -60,6 +60,7 @@ public int getBitIndex() {
   private final long activeModeDuration;
   private final int activeModeThreshold;
   private final long icdNodeId;
+  private final long checkInNodeId;
   private final long icdCounter;
   private final long monitoredSubject;
   private final long fabricId;
@@ -73,6 +74,7 @@ public int getBitIndex() {
       long activeModeDuration,
       int activeModeThreshold,
       long icdNodeId,
+      long checkInNodeId,
       long icdCounter,
       long monitoredSubject,
       long fabricId,
@@ -84,6 +86,7 @@ public int getBitIndex() {
     this.activeModeDuration = activeModeDuration;
     this.activeModeThreshold = activeModeThreshold;
     this.icdNodeId = icdNodeId;
+    this.checkInNodeId = checkInNodeId;
     this.icdCounter = icdCounter;
     this.monitoredSubject = monitoredSubject;
     this.fabricId = fabricId;
@@ -98,6 +101,7 @@ public int getBitIndex() {
       long activeModeDuration,
       int activeModeThreshold,
       long icdNodeId,
+      long checkInNodeId,
       long icdCounter,
       long monitoredSubject,
       long fabricId,
@@ -108,6 +112,7 @@ public int getBitIndex() {
     this.activeModeDuration = activeModeDuration;
     this.activeModeThreshold = activeModeThreshold;
     this.icdNodeId = icdNodeId;
+    this.checkInNodeId = checkInNodeId;
     this.icdCounter = icdCounter;
     this.monitoredSubject = monitoredSubject;
     this.fabricId = fabricId;
@@ -152,11 +157,16 @@ public int getActiveModeThreshold() {
     return activeModeThreshold;
   }
 
-  /** Returns the ICD Node Id. */
+  /** Returns the ICD peer Node Id. */
   public long getIcdNodeId() {
     return icdNodeId;
   }
 
+  /** Returns the checkIn Node Id. */
+  public long getIcdCheckInNodeId() {
+    return checkInNodeId;
+  }
+
   /** Returns the ICD Counter. */
   public long getIcdCounter() {
     return icdCounter;
@@ -186,6 +196,8 @@ public String toString() {
         + userActiveModeTriggerInstruction
         + "\n\ticdNodeId : "
         + icdNodeId
+        + "\n\ticdCheckInNodeId : "
+        + checkInNodeId
         + "\n\ticdCounter : "
         + icdCounter
         + "\n\tmonitoredSubject : "