diff --git a/common.mk b/common.mk
index 0c05bde2..c1f318c6 100644
--- a/common.mk
+++ b/common.mk
@@ -141,6 +141,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     ro.surface_flinger.set_display_power_timer_ms=500 \
     ro.surface_flinger.use_content_detection_for_refresh_rate=true
 
+# Disable configstore
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.display.ad.hdr_calib_data=/vendor/etc/hdr_config.cfg \
     ro.vendor.display.ad.sdr_calib_data=/vendor/etc/sdr_config.cfg \
diff --git a/configs/vintf/manifest.xml b/configs/vintf/manifest.xml
index fa4a8b1c..e05fb034 100644
--- a/configs/vintf/manifest.xml
+++ b/configs/vintf/manifest.xml
@@ -44,15 +44,6 @@
             <instance>legacy/0</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.configstore</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>ISurfaceFlingerConfigs</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.contexthub</name>
         <transport>hwbinder</transport>