diff --git a/CODEOWNERS b/CODEOWNERS
index 606c71f0a1c..73c6e63eb02 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -423,6 +423,7 @@ homeassistant/components/rainforest_eagle/* @gtdiehl @jcalbert
 homeassistant/components/rainmachine/* @bachya
 homeassistant/components/random/* @fabaff
 homeassistant/components/recollect_waste/* @bachya
+homeassistant/components/recorder/* @home-assistant/core
 homeassistant/components/rejseplanen/* @DarkFox
 homeassistant/components/renault/* @epenet
 homeassistant/components/repetier/* @MTrab
diff --git a/homeassistant/components/recorder/manifest.json b/homeassistant/components/recorder/manifest.json
index 4558e11c076..9ea08cc1f64 100644
--- a/homeassistant/components/recorder/manifest.json
+++ b/homeassistant/components/recorder/manifest.json
@@ -3,7 +3,7 @@
   "name": "Recorder",
   "documentation": "https://www.home-assistant.io/integrations/recorder",
   "requirements": ["sqlalchemy==1.4.23"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal",
   "iot_class": "local_push"
 }