diff --git a/app/scripts/comp/app/yubikey.js b/app/scripts/comp/app/yubikey.js
index 5dc5d81f..391f091e 100644
--- a/app/scripts/comp/app/yubikey.js
+++ b/app/scripts/comp/app/yubikey.js
@@ -56,17 +56,16 @@ const YubiKey = {
     },
 
     list(callback) {
-        this.ykChalResp.getYubiKeys((err, yubiKeys) => {
+        this.ykChalResp.getYubiKeys({}, (err, yubiKeys) => {
             if (err) {
                 return callback(err);
             }
-            yubiKeys = yubiKeys.map(({ serial, vid, pid, version, slot1, slot2 }) => {
+            yubiKeys = yubiKeys.map(({ serial, vid, pid, version, slots }) => {
                 return {
                     vid,
                     pid,
                     serial,
-                    slot1,
-                    slot2,
+                    slots,
                     fullName: this.getKeyFullName(pid, version, serial)
                 };
             });
diff --git a/app/scripts/views/open-chal-resp-view.js b/app/scripts/views/open-chal-resp-view.js
index 34d86850..65813cfd 100644
--- a/app/scripts/views/open-chal-resp-view.js
+++ b/app/scripts/views/open-chal-resp-view.js
@@ -53,14 +53,14 @@ class OpenChalRespView extends View {
             this.error = err;
             this.yubiKeys = [];
             if (yubiKeys) {
-                for (const { fullName, vid, pid, serial, slot1, slot2 } of yubiKeys) {
-                    for (const slot of [slot1 ? 1 : 0, slot2 ? 2 : 0].filter((s) => s)) {
+                for (const { fullName, vid, pid, serial, slots } of yubiKeys) {
+                    for (const slot of slots.filter((s) => s.valid)) {
                         this.yubiKeys.push({
                             fullName,
                             vid,
                             pid,
                             serial,
-                            slot
+                            slot: slot.number
                         });
                     }
                 }
diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js
index fa95d6a7..aea8c110 100644
--- a/app/scripts/views/settings/settings-file-view.js
+++ b/app/scripts/views/settings/settings-file-view.js
@@ -103,14 +103,14 @@ class SettingsFileView extends View {
         const yubiKeys = [];
         if (showYubiKeyBlock) {
             for (const yk of this.yubiKeys) {
-                for (const slot of [yk.slot1 ? 1 : 0, yk.slot2 ? 2 : 0].filter((s) => s)) {
+                for (const slot of yk.slots.filter((s) => s.valid)) {
                     yubiKeys.push({
                         value: `${yk.serial}:${slot}`,
                         fullName: yk.fullName,
                         vid: yk.vid,
                         pid: yk.pid,
                         serial: yk.serial,
-                        slot
+                        slot: slot.number
                     });
                 }
             }
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index cf9ddd90..15a052e5 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -5,8 +5,8 @@
   "requires": true,
   "dependencies": {
     "@keeweb/keeweb-native-modules": {
-      "version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.5/keeweb-native-modules.tgz",
-      "integrity": "sha512-rTJqip7SFDVEGdrWtpFQ0hiSqxmjVl1rVPegFTvA9WhObkSqfj2ORbmS1+EmuCD7pzDCd+T4Q71sdSaLzuDPtw=="
+      "version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.6/keeweb-native-modules.tgz",
+      "integrity": "sha512-1nCgKTU/esky1rFexCSs7U87A/sCEC6T/RNF5FO89dwzKMU9yVM/U7OuBspLuWnwxjCoaicTZr/WuYeoM1UATQ=="
     },
     "node-stream-zip": {
       "version": "1.4.2",
diff --git a/desktop/package.json b/desktop/package.json
index 353ed662..94a2d1fd 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -16,7 +16,7 @@
     "license": "MIT",
     "readme": "../README.md",
     "dependencies": {
-        "@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.5/keeweb-native-modules.tgz",
+        "@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.6/keeweb-native-modules.tgz",
         "node-stream-zip": "^1.4.2"
     },
     "devDependencies": {}
diff --git a/package-lock.json b/package-lock.json
index bd6ae334..b579a803 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2224,8 +2224,8 @@
       }
     },
     "@keeweb/keeweb-native-modules": {
-      "version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.5/keeweb-native-modules.tgz",
-      "integrity": "sha512-rTJqip7SFDVEGdrWtpFQ0hiSqxmjVl1rVPegFTvA9WhObkSqfj2ORbmS1+EmuCD7pzDCd+T4Q71sdSaLzuDPtw=="
+      "version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.6/keeweb-native-modules.tgz",
+      "integrity": "sha512-1nCgKTU/esky1rFexCSs7U87A/sCEC6T/RNF5FO89dwzKMU9yVM/U7OuBspLuWnwxjCoaicTZr/WuYeoM1UATQ=="
     },
     "@sindresorhus/is": {
       "version": "0.14.0",
diff --git a/package.json b/package.json
index 460ed776..53e1e966 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
         "@babel/plugin-proposal-class-properties": "^7.10.1",
         "@babel/plugin-proposal-optional-chaining": "^7.10.1",
         "@babel/preset-env": "^7.10.2",
-        "@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.5/keeweb-native-modules.tgz",
+        "@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.6/keeweb-native-modules.tgz",
         "adm-zip": "^0.4.14",
         "argon2-browser": "1.13.0",
         "autoprefixer": "^9.8.0",