diff --git a/properties/system.prop b/properties/system.prop
index 0dd9a61c..292178f2 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -71,7 +71,6 @@ debug.sf.hwc.min.duration=23000000
 debug.sf.hw=1
 debug.sf.enable_egl_image_tracker=true
 debug.sf.enable_hwc_vds=0
-debug.sf.latch_unsignaled=1
 ro.surface_flinger.max_virtual_display_dimension=4096
 
 # Fwk detect
diff --git a/properties/vendor.prop b/properties/vendor.prop
index fd07eba1..d3afbf58 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -139,6 +139,7 @@ vendor.gralloc.disable_ahardware_buffer=1
 vendor.gralloc.enable_fb_ubwc=1
 video.disable.ubwc=1
 vendor.video.disable.ubwc=1
+debug.sf.auto_latch_unsignaled=true
 
 # Fwk detect
 ro.vendor.qti.va_aosp.support=1