diff --git a/CODEOWNERS b/CODEOWNERS
index 318984b805a..cb559a7d7bb 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -411,7 +411,7 @@ build.json @home-assistant/supervisor
 /tests/components/generic/ @davet2001
 /homeassistant/components/generic_hygrostat/ @Shulyaka
 /tests/components/generic_hygrostat/ @Shulyaka
-/homeassistant/components/geniushub/ @zxdavb
+/homeassistant/components/geniushub/ @manzanotti
 /homeassistant/components/geo_json_events/ @exxamalte
 /tests/components/geo_json_events/ @exxamalte
 /homeassistant/components/geo_location/ @home-assistant/core
diff --git a/homeassistant/components/geniushub/manifest.json b/homeassistant/components/geniushub/manifest.json
index b1b9bbbb551..4029023bb07 100644
--- a/homeassistant/components/geniushub/manifest.json
+++ b/homeassistant/components/geniushub/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "geniushub",
   "name": "Genius Hub",
-  "codeowners": ["@zxdavb"],
+  "codeowners": ["@manzanotti"],
   "documentation": "https://www.home-assistant.io/integrations/geniushub",
   "iot_class": "local_polling",
   "loggers": ["geniushubclient"],