diff --git a/homeassistant/components/sensor/device_condition.py b/homeassistant/components/sensor/device_condition.py
index 55e993f46ba..34a2590ce8e 100644
--- a/homeassistant/components/sensor/device_condition.py
+++ b/homeassistant/components/sensor/device_condition.py
@@ -128,16 +128,18 @@ CONDITION_SCHEMA = vol.All(
                     CONF_IS_GAS,
                     CONF_IS_HUMIDITY,
                     CONF_IS_ILLUMINANCE,
-                    CONF_IS_OZONE,
                     CONF_IS_MOISTURE,
                     CONF_IS_NITROGEN_DIOXIDE,
                     CONF_IS_NITROGEN_MONOXIDE,
                     CONF_IS_NITROUS_OXIDE,
+                    CONF_IS_OZONE,
                     CONF_IS_POWER,
                     CONF_IS_POWER_FACTOR,
                     CONF_IS_PM1,
                     CONF_IS_PM10,
                     CONF_IS_PM25,
+                    CONF_IS_PRECIPITATION,
+                    CONF_IS_PRECIPITATION_INTENSITY,
                     CONF_IS_PRESSURE,
                     CONF_IS_REACTIVE_POWER,
                     CONF_IS_SIGNAL_STRENGTH,
@@ -145,6 +147,10 @@ CONDITION_SCHEMA = vol.All(
                     CONF_IS_TEMPERATURE,
                     CONF_IS_VOLATILE_ORGANIC_COMPOUNDS,
                     CONF_IS_VOLTAGE,
+                    CONF_IS_VOLUME,
+                    CONF_IS_WATER,
+                    CONF_IS_WEIGHT,
+                    CONF_IS_WIND_SPEED,
                     CONF_IS_VALUE,
                 ]
             ),
diff --git a/homeassistant/components/sensor/device_trigger.py b/homeassistant/components/sensor/device_trigger.py
index ef724881c52..c1b0699664e 100644
--- a/homeassistant/components/sensor/device_trigger.py
+++ b/homeassistant/components/sensor/device_trigger.py
@@ -138,6 +138,8 @@ TRIGGER_SCHEMA = vol.All(
                     CONF_PM25,
                     CONF_POWER,
                     CONF_POWER_FACTOR,
+                    CONF_PRECIPITATION,
+                    CONF_PRECIPITATION_INTENSITY,
                     CONF_PRESSURE,
                     CONF_REACTIVE_POWER,
                     CONF_SIGNAL_STRENGTH,
@@ -145,6 +147,10 @@ TRIGGER_SCHEMA = vol.All(
                     CONF_TEMPERATURE,
                     CONF_VOLATILE_ORGANIC_COMPOUNDS,
                     CONF_VOLTAGE,
+                    CONF_VOLUME,
+                    CONF_WATER,
+                    CONF_WEIGHT,
+                    CONF_WIND_SPEED,
                     CONF_VALUE,
                 ]
             ),