diff --git a/custom_components/ha_blueair/sensor.py b/custom_components/ha_blueair/sensor.py
index a4bd6e1..6cabc8e 100644
--- a/custom_components/ha_blueair/sensor.py
+++ b/custom_components/ha_blueair/sensor.py
@@ -22,21 +22,20 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     entities = []
 
     for device in aws_devices:
-        if device.model in (ModelEnum.UNKNOWN, ModelEnum.PROTECT_7470I):
+        if device.model == ModelEnum.HUMIDIFIER_I35:
             entities.extend([
                 BlueairTemperatureSensor(device),
                 BlueairHumiditySensor(device),
-                BlueairVOCSensor(device),
-                BlueairPM1Sensor(device),
-                BlueairPM10Sensor(device),
-                BlueairPM25Sensor(device),
             ])
-        elif device.model == ModelEnum.HUMIDIFIER_I35:
+        else:
             entities.extend([
                 BlueairTemperatureSensor(device),
                 BlueairHumiditySensor(device),
+                BlueairVOCSensor(device),
+                BlueairPM1Sensor(device),
+                BlueairPM10Sensor(device),
+                BlueairPM25Sensor(device),
             ])
-
     async_add_entities(entities)