diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImExtendableInvokeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImExtendableInvokeCommand.kt
index 0b1a2ab7467f5c..be1af1d62c0818 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImExtendableInvokeCommand.kt
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImExtendableInvokeCommand.kt
@@ -75,6 +75,7 @@ class PairOnNetworkLongImExtendableInvokeCommand(
         ) {
           setFailure("invoke failure with incorrect status")
         }
+        responseCount++
       }
 
       if (clusterId == CLUSTER_ID_TEST && commandId == TEST_ADD_ARGUMENT_RSP_COMMAND) {
@@ -89,8 +90,8 @@ class PairOnNetworkLongImExtendableInvokeCommand(
         if (status != null) {
           setFailure("invoke failure with incorrect status")
         }
+        responseCount++
       }
-      responseCount++
     }
 
     override fun onNoResponse(noInvokeResponseData: NoInvokeResponseData) {
@@ -126,7 +127,7 @@ class PairOnNetworkLongImExtendableInvokeCommand(
 
     val element1: InvokeElement =
       InvokeElement.newInstance(
-        /* endpointId= */ 0,
+        /* endpointId= */ 1,
         CLUSTER_ID_IDENTIFY,
         IDENTIFY_COMMAND,
         tlvWriter1.getEncoded(),