diff --git a/system.prop b/system.prop
index 8c3f1068..ca527388 100644
--- a/system.prop
+++ b/system.prop
@@ -25,8 +25,19 @@ persist.vendor.radio.report_codec=1
 persist.vendor.radio.vdp_on_ims_cap=1
 
 # Media
-media.settings.xml=/vendor/etc/media_profiles_vendor.xml
+av.offload.enable=true
+media.stagefright.enable-player=true
+media.stagefright.enable-http=true
+media.stagefright.enable-aac=true
+media.stagefright.enable-qcp=true
+media.stagefright.enable-fma2dp=true
+media.stagefright.enable-scan=true
 media.stagefright.thumbnail.prefer_hw_codecs=true
+media.aac_51_output_enabled=true
+media.settings.xml=/vendor/etc/media_profiles_vendor.xml
+mmp.enable.3g2=true
+persist.mm.enable.prefetch=true
+mm.enable.smoothstreaming=true
 
 # LMKD
 ro.config.low_ram=false
diff --git a/vendor.prop b/vendor.prop
index c09b5337..0f8358af 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -184,7 +184,6 @@ ro.hardware.keystore_desede=true
 # Media
 debug.stagefright.ccodec=1
 debug.stagefright.omx_default_rank=0
-mm.enable.smoothstreaming=true
 
 # Netflix
 ro.netflix.bsp_rev=Q855-16947-1