diff --git a/custom_components/mikrotik_router/sensor.py b/custom_components/mikrotik_router/sensor.py
index 55fccad..5770026 100644
--- a/custom_components/mikrotik_router/sensor.py
+++ b/custom_components/mikrotik_router/sensor.py
@@ -144,12 +144,6 @@ SENSOR_TYPES = {
         ATTR_PATH: "accounting",
         ATTR_ATTR: "wan-rx",
     },
-    "environment": {
-        ATTR_DEVICE_CLASS: None,
-        ATTR_ICON: "mdi:clipboard-list",
-        ATTR_PATH: "environment",
-        ATTR_ATTR: "name",
-    },
 }
 
 DEVICE_ATTRIBUTES_ACCOUNTING = ["address", "mac-address", "host-name"]
@@ -247,7 +241,7 @@ def update_items(inst, config_entry, mikrotik_controller, async_add_entities, se
 
     for uid in mikrotik_controller.data["environment"]:
         item_id = (
-            f"{inst}-environment-{mikrotik_controller.data['environment'][uid]['name']}"
+            f"{inst}-{sensor}-{mikrotik_controller.data['environment'][uid]['name']}"
         )
         _LOGGER.debug("Updating sensor %s", item_id)
         if item_id in sensors:
@@ -258,7 +252,7 @@ def update_items(inst, config_entry, mikrotik_controller, async_add_entities, se
         sensors[item_id] = MikrotikControllerEnvironmentSensor(
             mikrotik_controller=mikrotik_controller,
             inst=inst,
-            sensor="environment",
+            sensor=sensor,
             uid=uid,
         )
         new_sensors.append(sensors[item_id])