diff --git a/lib/ZwaveClient.js b/lib/ZwaveClient.js
index 1fdd9eee3f5..aac3de69591 100644
--- a/lib/ZwaveClient.js
+++ b/lib/ZwaveClient.js
@@ -1674,7 +1674,11 @@ ZwaveClient.prototype.connect = async function () {
           level: loglevels[this.cfg.logLevel],
           logToFile: this.cfg.logToFile,
           filename: ZWAVEJS_LOG_FILE,
-          forceConsole: true
+          forceConsole: true,
+          nodeFilter:
+            this.cfg.nodeFilter && this.cfg.nodeFilter.length > 0
+              ? this.cfg.nodeFilter.map(n => parseInt(n))
+              : undefined
         }
       },
       this.cfg.options
diff --git a/package-lock.json b/package-lock.json
index 501aac5a2f9..158662bb745 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3863,27 +3863,28 @@
       "dev": true
     },
     "@zwave-js/config": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-6.4.0.tgz",
-      "integrity": "sha512-cZBwW+LrtNaUysQrxXAgEToEHLTnassndkoGzoVxKI4oyAhagwm+/6z498l3dqgGcquOu80LcMTzsiS9oyWg+Q==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-6.5.0.tgz",
+      "integrity": "sha512-yY3HGrt5c5vTvbIIw5jKIMsT34CMl5r5YZw3NQ2XmPlJISgZPpZf1G7fzXrwz9oOlch5MTUL+8MGwU97YxGIGw==",
       "requires": {
-        "@zwave-js/core": "^6.4.0",
-        "@zwave-js/shared": "^6.2.0",
+        "@zwave-js/core": "^6.5.0",
+        "@zwave-js/shared": "^6.5.0",
         "alcalzone-shared": "^3.0.2",
         "ansi-colors": "^4.1.1",
         "fs-extra": "^9.0.1",
+        "json-logic-js": "^2.0.0",
         "json5": "^2.1.3",
         "semver": "^7.3.2",
         "winston": "^3.3.3"
       }
     },
     "@zwave-js/core": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-6.4.0.tgz",
-      "integrity": "sha512-FfjX4qWpYPlqeP/CdOSyt/3xq5mtjjcpIgPCcuUgcyb4Ranka3KAK0V9J1f1pgDVHIXg4AOjN2oWYZ4RbhcAvw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-6.5.0.tgz",
+      "integrity": "sha512-2PmOz+q8aFZGZueSQVmJGCksczws5yuxNiDI5mrdsHYVhbuRYXoOQvDkm4ECSY/MLrC7KK6etJgqTO1n6lg43Q==",
       "requires": {
         "@alcalzone/jsonl-db": "^1.2.3",
-        "@zwave-js/shared": "^6.2.0",
+        "@zwave-js/shared": "^6.5.0",
         "alcalzone-shared": "^3.0.2",
         "ansi-colors": "^4.1.1",
         "moment": "^2.29.0",
@@ -3893,11 +3894,11 @@
       }
     },
     "@zwave-js/serial": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-6.4.0.tgz",
-      "integrity": "sha512-zUABuFr5bM/ivxC7NNi6L1PdaSeKJ7TRnxRCElXMDrEcrtX3kbcoLYMUBiLapXMWOisjPpmafaWehd3XNhB3xQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-6.5.0.tgz",
+      "integrity": "sha512-/WU/ChpuvX1h7W2KyvgtxCbd3VgGFcvF2J7AKApnXFZ2/Rt9sH+BWP3u0OP6930fcZTQO4OQsg/F6oF9THKAvg==",
       "requires": {
-        "@zwave-js/core": "^6.4.0",
+        "@zwave-js/core": "^6.5.0",
         "alcalzone-shared": "^3.0.2",
         "serialport": "^9.0.1",
         "winston": "^3.3.3"
@@ -3913,9 +3914,9 @@
       }
     },
     "@zwave-js/shared": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@zwave-js/shared/-/shared-6.2.0.tgz",
-      "integrity": "sha512-xQeDt9GLAMTSvgFUMSOny/j1L1edd3A7Yr++G763fWabj4dX62ezO7ok5A5Ecld+AXAhjZY9s/nIhhm9yxsYiQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/shared/-/shared-6.5.0.tgz",
+      "integrity": "sha512-1Ht/QXKL/WoqISqbVKlPLnmpMEQQG4Tdzf8jLjzW152NglJg7+4IY9uSTkECgGvPyUxTU/YFyniNbZ6ndvklAg==",
       "requires": {
         "alcalzone-shared": "^3.0.2"
       }
@@ -11179,6 +11180,11 @@
       "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
       "optional": true
     },
+    "json-logic-js": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/json-logic-js/-/json-logic-js-2.0.0.tgz",
+      "integrity": "sha512-cQBDOXgFtFladCg99wnQ7YfN+nv1+Sznj4K6bp3CTgDJNJKgEXJE2VCXzVBjEU2e1UagDHSek52IQk5Ha38n7Q=="
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -20541,17 +20547,17 @@
       }
     },
     "zwave-js": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-6.4.0.tgz",
-      "integrity": "sha512-1Pm/+pUQptHxJcOl0++pRoAnoT5oTmpvYL2cZ8Gj7SWEry4HlU6HQaGtO/L6H2wqI1WtIGWZodelXJNIk5OdXQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-6.5.0.tgz",
+      "integrity": "sha512-3sJgLyDRfYptzJyVhWH2Z7FxsKDJlg1D3Nyb88XfV8M3G/bx5BLTZx5u5k8i/TgD08p9QLBsuLvrrTiboceCxw==",
       "requires": {
         "@alcalzone/jsonl-db": "^1.2.3",
         "@sentry/integrations": "^5.24.2",
         "@sentry/node": "^5.24.2",
-        "@zwave-js/config": "^6.4.0",
-        "@zwave-js/core": "^6.4.0",
-        "@zwave-js/serial": "^6.4.0",
-        "@zwave-js/shared": "^6.2.0",
+        "@zwave-js/config": "^6.5.0",
+        "@zwave-js/core": "^6.5.0",
+        "@zwave-js/serial": "^6.5.0",
+        "@zwave-js/shared": "^6.5.0",
         "alcalzone-shared": "^3.0.2",
         "ansi-colors": "^4.1.1",
         "fs-extra": "^9.0.1",
diff --git a/package.json b/package.json
index a22c4bd8d78..746b2b3642a 100644
--- a/package.json
+++ b/package.json
@@ -166,7 +166,7 @@
     "vuetify": "^2.4.5",
     "vuex": "^3.6.2",
     "winston": "^3.3.3",
-    "zwave-js": "^6.4.0"
+    "zwave-js": "^6.5.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.13.0",
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index b80914edb8a..e16223dc08b 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -172,6 +172,19 @@
                           v-model="newZwave.logToFile"
                         ></v-switch>
                       </v-col>
+                      <v-col v-if="newZwave.logEnabled" cols="12" sm="6">
+                        <v-combobox
+                          hint="Choose which nodes to log. Leave this empty to log all nodes"
+                          persistent-hint
+                          label="Log nodes"
+                          :items="newZwave.nodeFilter || []"
+                          multiple
+                          :rules="[rules.validNodeLog]"
+                          chips
+                          deletable-chips
+                          v-model="newZwave.nodeFilter"
+                        ></v-combobox>
+                      </v-col>
                       <v-col cols="6">
                         <v-text-field
                           v-model.number="newZwave.commandsTimeout"
@@ -685,6 +698,13 @@ export default {
 
           return valid || 'This field is required.'
         },
+        validNodeLog: values => {
+          return (
+            !values ||
+            values.every(v => v > 0 && v < 233) ||
+            'Nodes must be between 1-232'
+          )
+        },
         validName: value => {
           return (
             !/[!@#$%^&*)(+=:,;"'\\|?{}£°§<>[\]/.\s]/g.test(value) ||