diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index 24d37465..1a1c9d16 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -89,7 +89,7 @@ export default class RAOP {
     // console.log(this.castDevices.findIndex((item: any) => {return (item.name == host.replace(".local","") && item.port == port )}))
     if (
       this.castDevices.findIndex((item: any) => {
-        return item != null && item.name == (host ?? "Unknown").replace(".local", "") && item.port == port;
+        return item != null && item.name == (host ?? "Unknown").replace(".local", "") && item.port == port && (item.host == (addresses ? addresses[0] : ""));
       }) == -1
     ) {
       this.castDevices.push({
diff --git a/src/renderer/views/components/castmenu.ejs b/src/renderer/views/components/castmenu.ejs
index 4b1c78d2..77156d13 100644
--- a/src/renderer/views/components/castmenu.ejs
+++ b/src/renderer/views/components/castmenu.ejs
@@ -55,7 +55,7 @@
                                     </div>
                                     <div class="md-option-segment_auto"
                                          style="display: flex;justify-content: center;align-items: center"
-                                         v-if="activeCasts.includes(device)">
+                                         v-if="activeCasts.some(item => { return item.host == device.host && item.name == device.name && item.port == device.port})">
                                         Connected
                                     </div>
                                     <div class="md-option-segment_auto" v-else