diff --git a/extract-files.sh b/extract-files.sh
index 9e444b0..978ae82 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -63,6 +63,9 @@ function blob_fixup() {
         vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc)
             sed -i "s/4\.0/4\.1/g" "${2}"
             ;;
+        system_ext/etc/init/wfdservice.rc)
+            sed -i "/^service/! s/wfdservice$/wfdservice64/g" "${2}"
+            ;;
         # Remove dependency on android.hidl.base@1.0 for WFD native library.
         system_ext/lib64/libwfdnative.so)
             "${PATCHELF}" --remove-needed "android.hidl.base@1.0.so" "${2}"
diff --git a/system.prop b/system.prop
index 5d72677..8457e92 100644
--- a/system.prop
+++ b/system.prop
@@ -28,4 +28,3 @@ vendor.mm.enable.qcom_parser=16777215
 # WFD
 persist.debug.wfd.enable=1
 vendor.sys.video.disable.ubwc=1
-vendor.wfdservice64=enable