diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSConstants.java
index 8938c0caf..3fad9ecca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSConstants.java
@@ -3,6 +3,18 @@ package nodomain.freeyourgadget.gadgetbridge.devices.asteroidos;
 import java.util.UUID;
 
 public class AsteroidOSConstants {
+
+    // A list of all the supported devices and their codenames
+    public static final String[] SUPPORTED_DEVICE_CODENAMES = {
+            "bass", "sturgeon", "catfish", "catfish_ext",
+            "catshark", "lenok", "smelt", "carp",
+            "sparrow", "wren", "anthias", "beluga",
+            "dory", "firefish", "harmony", "inharmony",
+            "narwhal", "ray", "sawfish", "sawshark",
+            "skipjack", "tunny", "mooneye", "swift",
+            "minnow", "sprat", "tetra"
+    };
+
     // AsteroidOS Service Watch Filter UUID
     public static final UUID SERVICE_UUID               = UUID.fromString("00000000-0000-0000-0000-00A57E401D05");
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSDeviceCoordinator.java
index 51b1426ff..27f7e9f1e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSDeviceCoordinator.java
@@ -73,6 +73,11 @@ public class AsteroidOSDeviceCoordinator extends AbstractDeviceCoordinator {
         if (candidate.supportsService(AsteroidOSConstants.SERVICE_UUID)) {
             return DeviceType.ASTEROIDOS;
         }
+        for (String name : AsteroidOSConstants.SUPPORTED_DEVICE_CODENAMES) {
+            if (candidate.getName().equals(name)) {
+                return DeviceType.ASTEROIDOS;
+            }
+        }
         return DeviceType.UNKNOWN;
     }