diff --git a/lib/ZwaveClient.js b/lib/ZwaveClient.js
index 39bc6f20a60..bbfcfbff733 100644
--- a/lib/ZwaveClient.js
+++ b/lib/ZwaveClient.js
@@ -1672,8 +1672,7 @@ function guessFirmwareFormat (filename, firmware) {
 ZwaveClient.prototype.beginFirmwareUpdate = async function (
   nodeId,
   fileName,
-  data,
-  target = 0
+  data
 ) {
   if (this.driver && !this.closed) {
     const zwaveNode = this.getNode(nodeId)
@@ -1694,7 +1693,10 @@ ZwaveClient.prototype.beginFirmwareUpdate = async function (
       throw Error('Unable to extract firmware from file: ' + e.message)
     }
 
-    return zwaveNode.beginFirmwareUpdate(actualFirmware, target)
+    return zwaveNode.beginFirmwareUpdate(
+      actualFirmware.data,
+      actualFirmware.firmwareTarget
+    )
   }
 
   throw Error('Driver is closed')
diff --git a/package.json b/package.json
index 268bddaebc3..d9454fb69c7 100644
--- a/package.json
+++ b/package.json
@@ -208,4 +208,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
index 8455e713f69..edbfe192a7a 100644
--- a/src/components/ControlPanel.vue
+++ b/src/components/ControlPanel.vue
@@ -1188,7 +1188,10 @@ export default {
         var askId = this.node_actions.find(a => a.value === this.cnt_action)
         if (askId) {
           // don't send replaceFailed as broadcast
-          if (this.cnt_action !== 'replaceFailedNode') {
+          if (
+            this.cnt_action !== 'replaceFailedNode' &&
+            this.cnt_action !== 'beginFirmwareUpdate'
+          ) {
             broadcast = await this.$listeners.showConfirm(
               'Broadcast',
               'Send this command to all nodes?'