diff --git a/lib/switchbot.js b/lib/switchbot.js
index b2005479..d4355f70 100644
--- a/lib/switchbot.js
+++ b/lib/switchbot.js
@@ -201,7 +201,8 @@ class Switchbot {
     }
     if (id) {
       id = id.toLowerCase().replace(/\:/g, '');
-      if (ad.id !== id) {
+      ad_id = ad.address.toLowerCase().replace(/[^a-z0-9]/g, '');
+      if (ad_id !== id) { 
         return false;
       }
     }