diff --git a/custom_components/nicehash/nicehash.py b/custom_components/nicehash/nicehash.py
index e5544b5..93a32a2 100644
--- a/custom_components/nicehash/nicehash.py
+++ b/custom_components/nicehash/nicehash.py
@@ -141,7 +141,13 @@ class NiceHashPrivateClient:
         return await self.request("GET", "/main/api/v2/accounting/accounts2")
 
     async def get_mining_rigs(self):
-        return await self.request("GET", "/main/api/v2/mining/rigs2")
+        data = await self.request("GET", "/main/api/v2/mining/rigs2")
+        mining_rigs = data.get("miningRigs")
+        for mining_rig in mining_rigs:
+            devices = mining_rig.get("devices")
+            for device in devices:
+                device["id"] = str(mining_rig.get("rigId")) + "_" + str(device.get("id"))
+        return data
 
     async def get_mining_rig(self, rig_id):
         return await self.request("GET", f"/main/api/v2/mining/rig2/{rig_id}")