diff --git a/core/proguard-consumer-rules.pro b/core/proguard-consumer-rules.pro
index 76c16b19..7c03c7f5 100644
--- a/core/proguard-consumer-rules.pro
+++ b/core/proguard-consumer-rules.pro
@@ -31,11 +31,6 @@
 -keep class * extends com.rudderstack.rudderjsonadapter.RudderTypeAdapter
 
 # Required to ensure the DefaultPersistenceProviderFactory is not removed by Proguard
-# and works as expected even when the customer is not using encryption feature.
--dontwarn net.sqlcipher.Cursor
--dontwarn net.sqlcipher.database.SQLiteDatabase$CursorFactory
--dontwarn net.sqlcipher.database.SQLiteDatabase
--dontwarn net.sqlcipher.database.SQLiteOpenHelper
 -keep class com.rudderstack.android.sdk.core.persistence.DefaultPersistenceProviderFactory { *; }
 
 # Required for Device Mode Transformations
@@ -56,5 +51,8 @@
 -keepclassmembers class com.rudderstack.android.sdk.core.RudderTraits { java.util.Map extras; }
 
 # Required for DBEncryption feature using SQLCipher
--keep class net.sqlcipher.** { *; }
--keep class net.sqlcipher.database.* { *; }
\ No newline at end of file
+-dontwarn net.zetetic.database.DatabaseErrorHandler
+-dontwarn net.zetetic.database.sqlcipher.SQLiteDatabase$CursorFactory
+-dontwarn net.zetetic.database.sqlcipher.SQLiteDatabase
+-dontwarn net.zetetic.database.sqlcipher.SQLiteDatabaseHook
+-dontwarn net.zetetic.database.sqlcipher.SQLiteOpenHelper