diff --git a/apps/android/app/src/main/AndroidManifest.xml b/apps/android/app/src/main/AndroidManifest.xml
index 8c31ed4e5..eb5f13055 100644
--- a/apps/android/app/src/main/AndroidManifest.xml
+++ b/apps/android/app/src/main/AndroidManifest.xml
@@ -24,6 +24,8 @@
   <application
       android:name="SimplexApp"
       android:allowBackup="true"
+      android:fullBackupOnly="true"
+      android:backupAgent="BackupAgent"
       android:icon="@mipmap/icon"
       android:label="${app_name}"
       android:extractNativeLibs="${extract_native_libs}"
diff --git a/apps/android/app/src/main/java/chat/simplex/app/BackupAgent.kt b/apps/android/app/src/main/java/chat/simplex/app/BackupAgent.kt
new file mode 100644
index 000000000..bbe4e8318
--- /dev/null
+++ b/apps/android/app/src/main/java/chat/simplex/app/BackupAgent.kt
@@ -0,0 +1,18 @@
+package chat.simplex.app
+
+import android.app.backup.BackupAgentHelper
+import android.app.backup.FullBackupDataOutput
+import android.content.Context
+import chat.simplex.app.model.AppPreferences
+import chat.simplex.app.model.AppPreferences.Companion.SHARED_PREFS_PRIVACY_FULL_BACKUP
+
+class BackupAgent: BackupAgentHelper() {
+  override fun onFullBackup(data: FullBackupDataOutput?) {
+    if (applicationContext
+        .getSharedPreferences(AppPreferences.SHARED_PREFS_ID, Context.MODE_PRIVATE)
+        .getBoolean(SHARED_PREFS_PRIVACY_FULL_BACKUP, true)
+    ) {
+      super.onFullBackup(data)
+    }
+  }
+}
diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt
index 0e5c4e499..9a25d67e5 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt
@@ -103,6 +103,7 @@ class AppPreferences(val context: Context) {
     },
     set = fun(mode: SimplexLinkMode) { _simplexLinkMode.set(mode.name) }
   )
+  val privacyFullBackup = mkBoolPreference(SHARED_PREFS_PRIVACY_FULL_BACKUP, true)
   val experimentalCalls = mkBoolPreference(SHARED_PREFS_EXPERIMENTAL_CALLS, false)
   val chatArchiveName = mkStrPreference(SHARED_PREFS_CHAT_ARCHIVE_NAME, null)
   val chatArchiveTime = mkDatePreference(SHARED_PREFS_CHAT_ARCHIVE_TIME, null)
@@ -178,7 +179,7 @@ class AppPreferences(val context: Context) {
     )
 
   companion object {
-    private const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_APP_PREFS"
+    internal const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_APP_PREFS"
     private const val SHARED_PREFS_AUTO_RESTART_WORKER_VERSION = "AutoRestartWorkerVersion"
     private const val SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND = "RunServiceInBackground"
     private const val SHARED_PREFS_NOTIFICATIONS_MODE = "NotificationsMode"
@@ -195,6 +196,7 @@ class AppPreferences(val context: Context) {
     private const val SHARED_PREFS_PRIVACY_TRANSFER_IMAGES_INLINE = "PrivacyTransferImagesInline"
     private const val SHARED_PREFS_PRIVACY_LINK_PREVIEWS = "PrivacyLinkPreviews"
     private const val SHARED_PREFS_PRIVACY_SIMPLEX_LINK_MODE = "PrivacySimplexLinkMode"
+    internal val SHARED_PREFS_PRIVACY_FULL_BACKUP = "FullBackup"
     private const val SHARED_PREFS_EXPERIMENTAL_CALLS = "ExperimentalCalls"
     private const val SHARED_PREFS_CHAT_ARCHIVE_NAME = "ChatArchiveName"
     private const val SHARED_PREFS_CHAT_ARCHIVE_TIME = "ChatArchiveTime"
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt
index ed7dd74a5..0356a6e70 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt
@@ -84,6 +84,7 @@ fun DatabaseView(
       chatArchiveTime,
       chatLastStart,
       chatDbDeleted.value,
+      m.controller.appPrefs.privacyFullBackup,
       appFilesCountAndSize,
       chatItemTTL,
       startChat = { startChat(m, runChat, chatLastStart, m.chatDbChanged) },
@@ -132,6 +133,7 @@ fun DatabaseLayout(
   chatArchiveTime: MutableState<Instant?>,
   chatLastStart: MutableState<Instant?>,
   chatDbDeleted: Boolean,
+  privacyFullBackup: SharedPreference<Boolean>,
   appFilesCountAndSize: MutableState<Pair<Int, Long>>,
   chatItemTTL: MutableState<ChatItemTTL>,
   startChat: () -> Unit,
@@ -165,6 +167,8 @@ fun DatabaseLayout(
         disabled = operationsDisabled
       )
       SectionDivider()
+      SettingsPreferenceItem(Icons.Outlined.Backup, stringResource(R.string.full_backup), privacyFullBackup)
+      SectionDivider()
       SettingsActionItem(
         Icons.Outlined.IosShare,
         stringResource(R.string.export_database),
@@ -689,6 +693,7 @@ fun PreviewDatabaseLayout() {
       chatArchiveTime = remember { mutableStateOf(Clock.System.now()) },
       chatLastStart = remember { mutableStateOf(Clock.System.now()) },
       chatDbDeleted = false,
+      privacyFullBackup = SharedPreference({ true }, {}),
       appFilesCountAndSize = remember { mutableStateOf(0 to 0L) },
       chatItemTTL = remember { mutableStateOf(ChatItemTTL.None) },
       startChat = {},
diff --git a/apps/android/app/src/main/res/values-de/strings.xml b/apps/android/app/src/main/res/values-de/strings.xml
index ace8b2b07..ddc4ddbeb 100644
--- a/apps/android/app/src/main/res/values-de/strings.xml
+++ b/apps/android/app/src/main/res/values-de/strings.xml
@@ -618,6 +618,7 @@
   <string name="auto_accept_images">Bilder automatisch akzeptieren</string>
   <string name="transfer_images_faster">Bilder schneller übertragen</string>
   <string name="send_link_previews">Link-Vorschau senden</string>
+  <string name="full_backup">***App data backup</string>
 
   <!-- Settings sections -->
   <string name="settings_section_title_you">MEINE DATEN</string>
diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/android/app/src/main/res/values-ru/strings.xml
index dce10565f..a3c0da2f9 100644
--- a/apps/android/app/src/main/res/values-ru/strings.xml
+++ b/apps/android/app/src/main/res/values-ru/strings.xml
@@ -618,6 +618,7 @@
     <string name="auto_accept_images">Автоприем изображений</string>
     <string name="transfer_images_faster">Передавать изображения быстрее</string>
     <string name="send_link_previews">Отправлять картинки ссылок</string>
+    <string name="full_backup">Резервная копия данных</string>
 
     <!-- Settings sections -->
     <string name="settings_section_title_you">ВЫ</string>
diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/android/app/src/main/res/values/strings.xml
index a420a7488..ee76ea510 100644
--- a/apps/android/app/src/main/res/values/strings.xml
+++ b/apps/android/app/src/main/res/values/strings.xml
@@ -618,6 +618,7 @@
   <string name="auto_accept_images">Auto-accept images</string>
   <string name="transfer_images_faster">Transfer images faster</string>
   <string name="send_link_previews">Send link previews</string>
+  <string name="full_backup">App data backup</string>
 
   <!-- Settings sections -->
   <string name="settings_section_title_you">YOU</string>