diff --git a/src/platform/ESP32/ConfigurationManagerImpl.cpp b/src/platform/ESP32/ConfigurationManagerImpl.cpp
index ebdc3ad4a82fb0..2cf42f7ed141d1 100644
--- a/src/platform/ESP32/ConfigurationManagerImpl.cpp
+++ b/src/platform/ESP32/ConfigurationManagerImpl.cpp
@@ -189,7 +189,7 @@ CHIP_ERROR ConfigurationManagerImpl::GetProductURL(char * buf, size_t bufSize)
     CHIP_ERROR err = ReadConfigValueStr(ESP32Config::kConfigKey_ProductURL, buf, bufSize, bufSize);
     if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
-        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+        return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
     }
     return err;
 }
@@ -199,7 +199,7 @@ CHIP_ERROR ConfigurationManagerImpl::GetProductLabel(char * buf, size_t bufSize)
     CHIP_ERROR err = ReadConfigValueStr(ESP32Config::kConfigKey_ProductLabel, buf, bufSize, bufSize);
     if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
-        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+        return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
     }
     return err;
 }