diff --git a/plejd/DeviceRegistry.js b/plejd/DeviceRegistry.js
index c03d969..5912ba8 100644
--- a/plejd/DeviceRegistry.js
+++ b/plejd/DeviceRegistry.js
@@ -41,12 +41,17 @@ class DeviceRegistry {
     );
 
     if (added.roomId) {
-      const room = this.deviceIdsByRoom[added.roomId] || [];
-      if (!room.includes(added.roomId)) {
-        this.deviceIdsByRoom[added.roomId] = [...room, added.roomId];
+      if (!this.deviceIdsByRoom[added.roomId]) {
+        this.deviceIdsByRoom[added.roomId] = [];
+      }
+      const room = this.deviceIdsByRoom[added.roomId];
+      if (!room.includes(added.id)) {
+        this.deviceIdsByRoom[added.roomId] = [...room, added.id];
       }
       logger.verbose(
-        `Added to room #${added.roomId}: ${JSON.stringify(this.deviceIdsByRoom[added.roomId])}`,
+        `Added device to room ${added.roomId}: ${JSON.stringify(
+          this.deviceIdsByRoom[added.roomId],
+        )}`,
       );
     }
 
diff --git a/plejd/config.json b/plejd/config.json
index e0a2043..361eda4 100644
--- a/plejd/config.json
+++ b/plejd/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Plejd",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "slug": "plejd",
   "description": "Adds support for the Swedish home automation devices from Plejd.",
   "url": "https://github.com/icanos/hassio-plejd/",