diff --git a/CODEOWNERS b/CODEOWNERS
index c6794a605d9..ba727de5694 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -286,7 +286,7 @@ homeassistant/components/monoprice/* @etsinko @OnFreund
 homeassistant/components/moon/* @fabaff
 homeassistant/components/motion_blinds/* @starkillerOG
 homeassistant/components/mpd/* @fabaff
-homeassistant/components/mqtt/* @home-assistant/core @emontnemery
+homeassistant/components/mqtt/* @emontnemery
 homeassistant/components/msteams/* @peroyvind
 homeassistant/components/my/* @home-assistant/core
 homeassistant/components/myq/* @bdraco
diff --git a/homeassistant/components/mqtt/manifest.json b/homeassistant/components/mqtt/manifest.json
index 4d44090a4e3..9de3b071844 100644
--- a/homeassistant/components/mqtt/manifest.json
+++ b/homeassistant/components/mqtt/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/mqtt",
   "requirements": ["paho-mqtt==1.5.1"],
   "dependencies": ["http"],
-  "codeowners": ["@home-assistant/core", "@emontnemery"]
+  "codeowners": ["@emontnemery"]
 }