diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ff47f690..e461c535d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+Mobile: ensure that all BT/BLE flavors of the OSTC are recognized as dive computers [#2358]
 Desktop: allow copy&pasting of multiple cylinders [#2386]
 Desktop: don't output random SAC values for cylinders without data [#2376]
 Mobile: add menu entry to start a support email, using native email client
diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp
index 80e2285b8..ea76d3b1d 100644
--- a/core/btdiscovery.cpp
+++ b/core/btdiscovery.cpp
@@ -30,9 +30,10 @@ static dc_descriptor_t *getDeviceType(QString btName)
 		else if (btName.mid(4,2) == "4-") product = "OSTC 4";
 		else if (btName.mid(4,2) == "2-") product = "OSTC 2N";
 		else if (btName.mid(4,2) == "+ ") product = "OSTC 2";
-		// all OSTCs are HW_FAMILY_OSTC_3, so when we do not know,
-		// just try this
-		else product = "OSTC 3"; // all OSTCs are HW_FAMILY_OSTC_3
+		// all BT/BLE enabled OSTCs are HW_FAMILY_OSTC_3, so when we do not know,
+		// just use a default product that allows the codoe to download from the
+		// user's dive computer
+		else product = "OSTC 2";
 	}
 
 	if (btName.startsWith("Predator") ||