diff --git a/manifest.xml b/manifest.xml
index 664293d1..01d613a0 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -25,11 +25,6 @@
         <transport>hwbinder</transport>
         <fqname>@2.6::ICameraProvider/legacy/0</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.configstore</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.1::ISurfaceFlingerConfigs/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.gatekeeper</name>
         <transport>hwbinder</transport>
diff --git a/sdm660.mk b/sdm660.mk
index ccf59d68..8d475648 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -161,6 +161,10 @@ PRODUCT_PACKAGES += \
 # Dalvik
 $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk )
 
+# Configstore (Disabled)
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 # ConsumerIR
 ifeq ($(BOARD_HAVE_IR),true)
 PRODUCT_PACKAGES += \