diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index abde7e1b5..bdc3f4c10 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -1452,7 +1452,11 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                 JSONObject o = new JSONObject();
                 o.put("id", card.getId());
                 o.put("name", renderUnicodeAsImage(cropToLength(card.getName(),40)));
-                o.put("value", card.getCardId());
+                if (card.getBarcodeId() != null) {
+                    o.put("value", card.getBarcodeId());
+                } else {
+                    o.put("value", card.getCardId());
+                }
                 o.put("type", card.getBarcodeFormat().toString());
                 if (card.getExpiry() != null)
                     o.put("expiration", card.getExpiry().getTime()/1000);