diff --git a/vendor.mk b/vendor.mk
index d0089116e6ebdd6c5748122e0f781335dc64449c..2d2642d1be68dda0d8d8bcaedb126a672fb6b1f2 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -137,6 +137,10 @@ PRODUCT_PACKAGES += android.hardware.thermal@2.0-service.mock
 PRODUCT_COPY_FILES += \
     device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-goldfish.xml
 
+# Goldfish does not support ION needed for Codec 2.0
+PRODUCT_PROPERTY_OVERRIDES += \
+    debug.stagefright.ccodec=0
+
 
 PRODUCT_COPY_FILES += \
     device/generic/goldfish/fstab.ranchu.initrd:$(TARGET_COPY_OUT_RAMDISK)/fstab.ranchu \