diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index a16568b72..7b1b6c85e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -178,6 +178,12 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
                     getSupport().evaluateGBDeviceEvent(findPhoneEvent);
                 }
                 return;
+            case CMD_FIND_WATCH:
+                if (cmd.hasSystem()) {
+                    LOG.debug("Got find device: {}", cmd.getSystem().getFindDevice());
+                    // TODO mark device as found
+                }
+                return;
             case CMD_DISPLAY_ITEMS_GET:
                 handleDisplayItems(cmd.getSystem().getDisplayItems());
                 return;
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index d189aa944..1664adf7e 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -87,7 +87,7 @@ message System {
   optional Clock clock = 4;
 
   // 2, 18
-  optional uint32 findDevice = 5; // 0
+  optional uint32 findDevice = 5; // 0, 1 == "found it" pressed on device
 
   // 2, 29 get | 2, 39 set
   optional DisplayItems displayItems = 10;