diff --git a/CODEOWNERS b/CODEOWNERS
index 91e6ab489473..9e7c09dc3738 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -238,6 +238,7 @@ homeassistant/components/spider/* @peternijssen
 homeassistant/components/sql/* @dgomes
 homeassistant/components/statistics/* @fabaff
 homeassistant/components/stiebel_eltron/* @fucm
+homeassistant/components/stream/* @hunterjm
 homeassistant/components/sun/* @Swamp-Ig
 homeassistant/components/supla/* @mwegrzynek
 homeassistant/components/swiss_hydrological_data/* @fabaff
diff --git a/homeassistant/components/stream/manifest.json b/homeassistant/components/stream/manifest.json
index 9020ffb5b2bd..f285f81f27fd 100644
--- a/homeassistant/components/stream/manifest.json
+++ b/homeassistant/components/stream/manifest.json
@@ -8,5 +8,5 @@
   "dependencies": [
     "http"
   ],
-  "codeowners": []
+  "codeowners": ["@hunterjm"]
 }