diff --git a/CODEOWNERS b/CODEOWNERS
index 408caee4f2..c97318f937 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -93,6 +93,7 @@ esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp32_rmt_led_strip/* @jesserockz
 esphome/components/esp8266/* @esphome/core
+esphome/components/esp_adf/* @jesserockz
 esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
diff --git a/esphome/components/esp_adf/__init__.py b/esphome/components/esp_adf/__init__.py
index 0a97e11adf..bfe524c1cd 100644
--- a/esphome/components/esp_adf/__init__.py
+++ b/esphome/components/esp_adf/__init__.py
@@ -5,7 +5,8 @@ from esphome.components import esp32
 
 from esphome.const import CONF_ID
 
-# CONFLICTS_WITH = ["i2s_audio"]
+CONFLICTS_WITH = ["i2s_audio"]
+CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["esp32"]
 
 CONF_ESP_ADF_ID = "esp_adf_id"
diff --git a/esphome/components/esp_adf/microphone/__init__.py b/esphome/components/esp_adf/microphone/__init__.py
index c2c3d3d4a1..ccfc280d50 100644
--- a/esphome/components/esp_adf/microphone/__init__.py
+++ b/esphome/components/esp_adf/microphone/__init__.py
@@ -6,7 +6,6 @@ from esphome.const import CONF_ID
 from .. import CONF_ESP_ADF_ID, ESPADF, ESPADFPipeline, esp_adf_ns
 
 AUTO_LOAD = ["esp_adf"]
-CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["esp32"]
 
 ESPADFMicrophone = esp_adf_ns.class_(
diff --git a/esphome/components/esp_adf/speaker/__init__.py b/esphome/components/esp_adf/speaker/__init__.py
index e72721e3dc..2fb30ff849 100644
--- a/esphome/components/esp_adf/speaker/__init__.py
+++ b/esphome/components/esp_adf/speaker/__init__.py
@@ -6,7 +6,6 @@ from esphome.const import CONF_ID
 from .. import CONF_ESP_ADF_ID, ESPADF, ESPADFPipeline, esp_adf_ns
 
 AUTO_LOAD = ["esp_adf"]
-CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["esp32"]
 
 ESPADFSpeaker = esp_adf_ns.class_(