diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index beba6e8f589e29..631275394f199b 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -179,3 +179,6 @@ jobs:
 
             - name: Build example Lock App (Target:ESP32C6)
               run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults esp32c6
+
+            - name: Build example thread-br-app (Target:ESP32S3)
+              run: scripts/examples/esp_example.sh thread-br-app sdkconfig.defaults esp32s3
diff --git a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
index 14828e90f50823..ef611d84b78d98 100644
--- a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
+++ b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
@@ -119,7 +119,9 @@ CHIP_ERROR GenericThreadDriver::RevertConfiguration()
     // since the fail-safe was armed, so return with no error.
     VerifyOrReturnError(error != CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND, CHIP_NO_ERROR);
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
     ThreadStackMgrImpl().ClearAllSrpHostAndServices();
+#endif
 
     if (!GetEnabled())
     {