diff --git a/BoardConfigPlatform.mk b/BoardConfigPlatform.mk
index 41b9749..2b29150 100644
--- a/BoardConfigPlatform.mk
+++ b/BoardConfigPlatform.mk
@@ -134,10 +134,6 @@
 ### DISPLAY
 TARGET_SCREEN_DENSITY := 240
 
-### GRAPHICS
-# hardware/interfaces/configstore/1.1/default/surfaceflinger.mk
-NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
-
 ### HIDL
 DEVICE_MANIFEST_FILE += $(PLATFORM_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := $(PLATFORM_PATH)/compatibility_matrix.xml
diff --git a/vendor.prop b/vendor.prop
index 3d3f15e..60e5233 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -22,6 +22,7 @@
 # Disable backpressure propagation
 debug.sf.disable_backpressure=1
 debug.sf.latch_unsignaled=1
+ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 
 ### DEVELOPER SETTINGS
 # Disable invocation of oem_lock