diff --git a/homeassistant/components/sensor/min_max.py b/homeassistant/components/sensor/min_max.py
index 7d9e91a1bf1..f0334ef3255 100644
--- a/homeassistant/components/sensor/min_max.py
+++ b/homeassistant/components/sensor/min_max.py
@@ -11,7 +11,8 @@ import voluptuous as vol
 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import (
-    CONF_NAME, STATE_UNKNOWN, CONF_TYPE, ATTR_UNIT_OF_MEASUREMENT)
+    CONF_NAME, STATE_UNKNOWN, STATE_UNAVAILABLE, CONF_TYPE,
+    ATTR_UNIT_OF_MEASUREMENT)
 from homeassistant.core import callback
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import async_track_state_change
@@ -125,7 +126,8 @@ class MinMaxSensor(Entity):
         @callback
         def async_min_max_sensor_state_listener(entity, old_state, new_state):
             """Handle the sensor state changes."""
-            if new_state.state is None or new_state.state in STATE_UNKNOWN:
+            if (new_state.state is None
+                    or new_state.state in [STATE_UNKNOWN, STATE_UNAVAILABLE]):
                 self.states[entity] = STATE_UNKNOWN
                 hass.async_add_job(self.async_update_ha_state, True)
                 return
diff --git a/tests/components/sensor/test_min_max.py b/tests/components/sensor/test_min_max.py
index ae2f40e5802..f76a05c2ce0 100644
--- a/tests/components/sensor/test_min_max.py
+++ b/tests/components/sensor/test_min_max.py
@@ -3,7 +3,8 @@ import unittest
 
 from homeassistant.setup import setup_component
 from homeassistant.const import (
-    STATE_UNKNOWN, ATTR_UNIT_OF_MEASUREMENT, TEMP_CELSIUS, TEMP_FAHRENHEIT)
+    STATE_UNKNOWN, STATE_UNAVAILABLE, ATTR_UNIT_OF_MEASUREMENT, TEMP_CELSIUS,
+    TEMP_FAHRENHEIT)
 from tests.common import get_test_home_assistant
 
 
@@ -209,7 +210,7 @@ class TestMinMaxSensor(unittest.TestCase):
         state = self.hass.states.get('sensor.test_max')
         assert STATE_UNKNOWN != state.state
 
-        self.hass.states.set(entity_ids[1], STATE_UNKNOWN)
+        self.hass.states.set(entity_ids[1], STATE_UNAVAILABLE)
         self.hass.block_till_done()
 
         state = self.hass.states.get('sensor.test_max')