diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index b253158..5acb97b 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -16,5 +16,3 @@ BqrEventMaskValueUpdate = 295006
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
 BtOpusEnabled = true
-
-POFEnable = true
diff --git a/device-husky.mk b/device-husky.mk
index 1e05080..d5bbf27 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -93,6 +93,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.a2dp_offload.disabled=false \
     persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
+# POF
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.bluetooth.finder.supported=true
+
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio
diff --git a/device-shiba.mk b/device-shiba.mk
index 4dba843..807a8ba 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -83,6 +83,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.a2dp_offload.disabled=false \
     persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
+# POF
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.bluetooth.finder.supported=true
+
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio