diff --git a/homeassistant/components/threshold/binary_sensor.py b/homeassistant/components/threshold/binary_sensor.py
index 49a97d84f0e..802aa22d759 100644
--- a/homeassistant/components/threshold/binary_sensor.py
+++ b/homeassistant/components/threshold/binary_sensor.py
@@ -151,8 +151,10 @@ class ThresholdSensor(BinarySensorEntity):
             _update_sensor_state()
             self.async_write_ha_state()
 
-        async_track_state_change_event(
-            hass, [entity_id], async_threshold_sensor_state_listener
+        self.async_on_remove(
+            async_track_state_change_event(
+                hass, [entity_id], async_threshold_sensor_state_listener
+            )
         )
         _update_sensor_state()