diff --git a/device-cheetah.mk b/device-cheetah.mk
index cefd34e..dbe924c 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -39,6 +39,7 @@ $(call soong_config_set,lyric,tuning_product,cheetah)
 $(call soong_config_set,google3a_config,target_device,cheetah)
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.support_kernel_idle_timer=true
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true
 
 # Init files
 PRODUCT_COPY_FILES += \
diff --git a/device-panther.mk b/device-panther.mk
index 075f5ea..979ef35 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -175,6 +175,7 @@ endif
 
 # Display
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true
 
 # WiFi Overlay
 PRODUCT_PACKAGES += \