diff --git a/device.mk b/device.mk
index 66e2ae2..a78d3f7 100644
--- a/device.mk
+++ b/device.mk
@@ -459,7 +459,6 @@
 
 # WiFi Display
 PRODUCT_PACKAGES += \
-    android.media.audio.common.types-V2-cpp \
     libnl \
     libpng.vendor:32 \
     libwfdaac_vendor:32
diff --git a/extract-files.sh b/extract-files.sh
index 49b1ca1..894b914 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -55,6 +55,9 @@
 
 function blob_fixup() {
     case "${1}" in
+        system_ext/lib/libwfdservice.so)
+            "${PATCHELF}" --replace-needed "android.media.audio.common.types-V2-cpp.so" "android.media.audio.common.types-V3-cpp.so" "${2}"
+            ;;
         system_ext/lib64/libwfdnative.so)
             sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}"
             ;;