diff --git a/device-akita.mk b/device-akita.mk
index 59de798..a9b9e60 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -333,10 +333,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
           ro.com.google.ime.kb_pad_port_b=4.19 \
           ro.com.google.ime.height_ratio=1.1
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_VENDOR_PROPERTIES += \
-       persist.vendor.usb.displayport.enabled=1
-else
+# DisplayPort is disabled (b/300167292, b/300167292)
 PRODUCT_VENDOR_PROPERTIES += \
        persist.vendor.usb.displayport.enabled=0
-endif