diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
index 2efe005230f..2e33742b8e5 100644
--- a/homeassistant/components/esphome/__init__.py
+++ b/homeassistant/components/esphome/__init__.py
@@ -978,3 +978,8 @@ class EsphomeEntity(Entity, Generic[_InfoT, _StateT]):
     def should_poll(self) -> bool:
         """Disable polling."""
         return False
+
+    @property
+    def entity_registry_enabled_default(self) -> bool:
+        """Return if the entity should be enabled when first added to the entity registry."""
+        return not self._static_info.disabled_by_default
diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index 22fa33091fd..f702b35e4c8 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -3,7 +3,7 @@
   "name": "ESPHome",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/esphome",
-  "requirements": ["aioesphomeapi==6.0.1"],
+  "requirements": ["aioesphomeapi==6.1.0"],
   "zeroconf": ["_esphomelib._tcp.local."],
   "codeowners": ["@OttoWinter", "@jesserockz"],
   "after_dependencies": ["zeroconf", "tag"],
diff --git a/requirements_all.txt b/requirements_all.txt
index d6a496a8a0d..15ae09b74b0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -164,7 +164,7 @@ aioeafm==0.1.2
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==6.0.1
+aioesphomeapi==6.1.0
 
 # homeassistant.components.flo
 aioflo==0.4.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index d5ef06dac87..ac0d3e3d991 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -103,7 +103,7 @@ aioeafm==0.1.2
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==6.0.1
+aioesphomeapi==6.1.0
 
 # homeassistant.components.flo
 aioflo==0.4.1