diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index c69f4f4d8c6..17ff2ca96ba 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==2.6.4"],
+  "requirements": ["aioesphomeapi==2.6.5"],
   "zeroconf": ["_esphomelib._tcp.local."],
   "codeowners": ["@OttoWinter"],
   "after_dependencies": ["zeroconf", "tag"]
diff --git a/homeassistant/components/esphome/sensor.py b/homeassistant/components/esphome/sensor.py
index a5cc321cb08..68a8c00caed 100644
--- a/homeassistant/components/esphome/sensor.py
+++ b/homeassistant/components/esphome/sensor.py
@@ -52,6 +52,8 @@ class EsphomeSensor(EsphomeEntity):
     @property
     def icon(self) -> str:
         """Return the icon."""
+        if self._static_info.icon == "":
+            return None
         return self._static_info.icon
 
     @property
@@ -71,8 +73,17 @@ class EsphomeSensor(EsphomeEntity):
     @property
     def unit_of_measurement(self) -> str:
         """Return the unit the value is expressed in."""
+        if self._static_info.unit_of_measurement == "":
+            return None
         return self._static_info.unit_of_measurement
 
+    @property
+    def device_class(self) -> str:
+        """Return the class of this device, from component DEVICE_CLASSES."""
+        if self._static_info.device_class == "":
+            return None
+        return self._static_info.device_class
+
 
 class EsphomeTextSensor(EsphomeEntity):
     """A text sensor implementation for ESPHome."""
diff --git a/requirements_all.txt b/requirements_all.txt
index b1a18147b25..640c2ace4df 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -154,7 +154,7 @@ aiodns==2.0.0
 aioeafm==0.1.2
 
 # homeassistant.components.esphome
-aioesphomeapi==2.6.4
+aioesphomeapi==2.6.5
 
 # homeassistant.components.flo
 aioflo==0.4.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index bc1e86fc61f..6b77eaafb9d 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -91,7 +91,7 @@ aiodns==2.0.0
 aioeafm==0.1.2
 
 # homeassistant.components.esphome
-aioesphomeapi==2.6.4
+aioesphomeapi==2.6.5
 
 # homeassistant.components.flo
 aioflo==0.4.1