diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index be10cf908e8162..701d6d6683aad7 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -61,6 +61,7 @@ AndroidDeviceControllerWrapper::~AndroidDeviceControllerWrapper()
         mKeypairBridge = nullptr;
     }
 #endif // JAVA_MATTER_CONTROLLER_TEST
+
     if (mDeviceAttestationDelegateBridge != nullptr)
     {
         delete mDeviceAttestationDelegateBridge;
diff --git a/src/controller/java/DeviceAttestationDelegateBridge.cpp b/src/controller/java/DeviceAttestationDelegateBridge.cpp
index 89bd2eebc41f39..be46a783b197ad 100644
--- a/src/controller/java/DeviceAttestationDelegateBridge.cpp
+++ b/src/controller/java/DeviceAttestationDelegateBridge.cpp
@@ -66,7 +66,7 @@ void DeviceAttestationDelegateBridge::OnDeviceAttestationCompleted(
     const chip::Credentials::DeviceAttestationVerifier::AttestationDeviceInfo & info,
     chip::Credentials::AttestationVerificationResult attestationResult)
 {
-    ChipLogProgress(Controller, "OnDeviceAttestationCompleted with result: %hu", attestationResult);
+    ChipLogProgress(Controller, "OnDeviceAttestationCompleted with result: %hu", static_cast<uint16_t>(attestationResult));
 
     mResult = attestationResult;
     if (mDeviceAttestationDelegate != nullptr)