diff --git a/device-cheetah.mk b/device-cheetah.mk
index ba27799..4bfe74a 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -466,12 +466,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.device_id=cheetah
 
 # Bluetooth device id
+# Cheetah: 0x410A
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20490
+    bluetooth.device_id.product_id=16650
 
 # ETM
 ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
-endif
+endif
\ No newline at end of file
diff --git a/device-panther.mk b/device-panther.mk
index b58d280..a50f2ea 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -449,8 +449,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.device_id=panther
 
 # Bluetooth device id
+# Panther: 0x4109
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20489
+    bluetooth.device_id.product_id=16649
 
 # ETM
 ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))