diff --git a/src/ui/components/BrowserList.jsx b/src/ui/components/BrowserList.jsx
index bb15451..2430ef2 100644
--- a/src/ui/components/BrowserList.jsx
+++ b/src/ui/components/BrowserList.jsx
@@ -188,7 +188,10 @@ export class BrowserList extends Component {
                                     return (
                                         <BrowserListItem
                                             style={style}
-                                            key={item.id}
+                                            key={
+                                                item.id ||
+                                                `position-${position}`
+                                            }
                                             model={item}
                                             position={position}
                                         />
diff --git a/src/ui/services/SonosService.js b/src/ui/services/SonosService.js
index 959ea5b..b0f2441 100644
--- a/src/ui/services/SonosService.js
+++ b/src/ui/services/SonosService.js
@@ -446,7 +446,7 @@ const SonosService = {
                 {
                     const lastChange = xml2json(data.LastChange);
 
-                    if (subscription) {
+                    if (subscription && this._currentDevice) {
                         const transportState = subscription.sonos.translateState(
                             lastChange.Event.InstanceID.TransportState.$.val
                         );