diff --git a/lib/canbus.js b/lib/canbus.js
index 74e0f47..edaf31b 100644
--- a/lib/canbus.js
+++ b/lib/canbus.js
@@ -168,7 +168,8 @@ CanbusStream.prototype.connect = function() {
         this.lastDataReceived = Date.now()
       }
 
-      if ( that.candevice && that.candevice.cansend && pgn.src == that.candevice.address ) {
+      //always send address claims through
+      if ( pgn.pgn != 60928 && that.candevice && that.candevice.cansend && pgn.src == that.candevice.address ) {
         return
       }
 
diff --git a/lib/candevice.js b/lib/candevice.js
index 5fe6519..e893a17 100644
--- a/lib/candevice.js
+++ b/lib/candevice.js
@@ -143,10 +143,7 @@ function handleISORequest(device, n2kMsg) {
     sendProductInformation(device)
     break;
   case 60928:   // ISO address claim request
-    //sendAddressClaim(device)
-    let ac = JSON.parse(JSON.stringify(device.addressClaim))
-    ac.dst = n2kMsg.src
-    sendPGN(device, ac)
+    sendPGN(device, device.addressClaim)
     break;
   case 126464:
     sendPGNList(device)