diff --git a/src/app/CommandHandler.cpp b/src/app/CommandHandler.cpp
index df58e38c5129b1..d291d8154d421f 100644
--- a/src/app/CommandHandler.cpp
+++ b/src/app/CommandHandler.cpp
@@ -484,7 +484,15 @@ void CommandHandler::AddStatusAndLogIfFailure(const ConcreteCommandPath & aComma
                      ChipLogValueIMStatus(aStatus), aMessage);
     }
 
-    LogErrorOnFailure(AddStatus(aCommandPath, aStatus));
+    CHIP_ERROR err = AddStatus(aCommandPath, aStatus);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DataManagement,
+                     "Failed to set status on Endpoint=%u Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI
+                     ": %" CHIP_ERROR_FORMAT,
+                     aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId),
+                     err.Format());
+    }
 }
 
 CHIP_ERROR CommandHandler::AddClusterSpecificSuccess(const ConcreteCommandPath & aCommandPath, ClusterStatus aClusterStatus)
diff --git a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
index 51a9977977a042..fcd0dfa1353516 100644
--- a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
+++ b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
@@ -450,7 +450,6 @@ bool emberAfGroupKeyManagementClusterKeySetWriteCallback(
     Credentials::GroupDataProvider * provider = nullptr;
     const FabricInfo * fabric                 = nullptr;
 
-    // Flight-check fabric scoping.
     if (!GetProviderAndFabric(commandObj, commandPath, &provider, &fabric))
     {
         // Command will already have status populated from validation.
@@ -555,7 +554,6 @@ bool emberAfGroupKeyManagementClusterKeySetReadCallback(
     Credentials::GroupDataProvider * provider = nullptr;
     const FabricInfo * fabric                 = nullptr;
 
-    // Flight-check fabric scoping.
     if (!GetProviderAndFabric(commandObj, commandPath, &provider, &fabric))
     {
         // Command will already have status populated from validation.
@@ -621,7 +619,6 @@ bool emberAfGroupKeyManagementClusterKeySetRemoveCallback(
     Credentials::GroupDataProvider * provider = nullptr;
     const FabricInfo * fabric                 = nullptr;
 
-    // Flight-check fabric scoping.
     if (!GetProviderAndFabric(commandObj, commandPath, &provider, &fabric))
     {
         // Command will already have status populated from validation.
@@ -694,7 +691,6 @@ bool emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(
     Credentials::GroupDataProvider * provider = nullptr;
     const FabricInfo * fabric                 = nullptr;
 
-    // Flight-check fabric scoping.
     if (!GetProviderAndFabric(commandObj, commandPath, &provider, &fabric))
     {
         // Command will already have status populated from validation.