diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index 83c117d6c05..b73208402f8 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -785,7 +785,7 @@ class MediaPlayerDevice(Entity):
     @property
     def capability_attributes(self):
         """Return capabilitiy attributes."""
-        supported_features = self.supported_features
+        supported_features = self.supported_features or 0
         data = {}
 
         if supported_features & SUPPORT_SELECT_SOURCE:
diff --git a/homeassistant/components/water_heater/__init__.py b/homeassistant/components/water_heater/__init__.py
index 8da94ff1098..ecff3105ae0 100644
--- a/homeassistant/components/water_heater/__init__.py
+++ b/homeassistant/components/water_heater/__init__.py
@@ -146,7 +146,7 @@ class WaterHeaterDevice(Entity):
     @property
     def capability_attributes(self):
         """Return capabilitiy attributes."""
-        supported_features = self.supported_features
+        supported_features = self.supported_features or 0
 
         data = {
             ATTR_MIN_TEMP: show_temp(