diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java
index 40ac47764..e878d0b5d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java
@@ -21,6 +21,7 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 
 public class GBDeviceEventVersionInfo extends GBDeviceEvent {
     public String fwVersion = "N/A";
+    public String fwVersion2 = null;
     public String hwVersion = "N/A";
 
     public GBDeviceEventVersionInfo() {
@@ -33,6 +34,6 @@ public class GBDeviceEventVersionInfo extends GBDeviceEvent {
 
     @Override
     public String toString() {
-        return super.toString() + "fwVersion: " + fwVersion + "; hwVersion: " + hwVersion;
+        return super.toString() + "fwVersion: " + fwVersion + "; fwVersion2: " + fwVersion2 + "; hwVersion: " + hwVersion;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 3e5676d18..a1ccd281a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -311,6 +311,9 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             return;
         }
         gbDevice.setFirmwareVersion(infoEvent.fwVersion);
+        if (infoEvent.fwVersion2 != null) {
+            gbDevice.setFirmwareVersion2(infoEvent.fwVersion2);
+        }
         gbDevice.setModel(infoEvent.hwVersion);
         gbDevice.sendDeviceUpdateIntent(context);
     }
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 e431c0ec0..4faf6af03 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
@@ -102,6 +102,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
 import nodomain.freeyourgadget.gadgetbridge.devices.banglejs.BangleJSConstants;
 import nodomain.freeyourgadget.gadgetbridge.devices.banglejs.BangleJSSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.BangleJSActivitySample;
@@ -328,12 +329,12 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         //sendSettings(builder);
 
         // get version
-
         gbDevice.setState(GBDevice.State.INITIALIZED);
         gbDevice.sendDeviceUpdateIntent(getContext());
-
-        getDevice().setFirmwareVersion("N/A");
-        getDevice().setFirmwareVersion2("N/A");
+        if (getDevice().getFirmwareVersion() == null) {
+            getDevice().setFirmwareVersion("N/A");
+            getDevice().setFirmwareVersion2("N/A");
+        }
         lastBatteryPercent = -1;
 
         LOG.info("Initialization Done");
@@ -507,10 +508,12 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                 GB.toast(getContext(), "Bangle.js: " + json.getString("msg"), Toast.LENGTH_LONG, GB.ERROR);
                 break;
             case "ver": {
-                if (json.has("fw1"))
-                    getDevice().setFirmwareVersion(json.getString("fw1"));
-                if (json.has("fw2"))
-                    getDevice().setFirmwareVersion2(json.getString("fw2"));
+                final GBDeviceEventVersionInfo gbDeviceEventVersionInfo = new GBDeviceEventVersionInfo();
+                if (json.has("fw"))
+                    gbDeviceEventVersionInfo.fwVersion = json.getString("fw");
+                if (json.has("hw"))
+                    gbDeviceEventVersionInfo.hwVersion = json.getString("hw");
+                evaluateGBDeviceEvent(gbDeviceEventVersionInfo);
             } break;
             case "findPhone": {
                 boolean start = json.has("n") && json.getBoolean("n");
@@ -1701,5 +1704,4 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
             LOG.info("JSONException: " + e.getLocalizedMessage());
         }
     }
-
 }