diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index f59975f1..09463985 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -221,9 +221,6 @@ public class ExternalPebbleJSActivity extends GBActivity {
 
                     if (passKey) {
                         Object obj = in.get(inKey);
-                        if (obj instanceof Boolean) {
-                            obj = ((Boolean) obj) ? "true" : "false";
-                        }
                         out.put(outKey, obj);
                     } else {
                         GB.toast("Discarded key " + inKey + ", not found in the local configuration and is not an integer key.", Toast.LENGTH_SHORT, GB.WARN);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
index b3b21b30..d9bd9f2d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
@@ -87,6 +87,8 @@ public class PebbleSupport extends AbstractSerialDeviceSupport {
                         byteArray[i] = ((Integer) jsonArray.get(i)).byteValue();
                     }
                     object = byteArray;
+                } else if (object instanceof Boolean) {
+                    object = (short) (((Boolean) object) ? 1 : 0);
                 }
                 pairs.add(new Pair<>(Integer.parseInt(keyStr), object));
             }