diff --git a/changelog.d/6429.misc b/changelog.d/6429.misc
new file mode 100644
index 0000000000..4c748f652c
--- /dev/null
+++ b/changelog.d/6429.misc
@@ -0,0 +1 @@
+Add `android:hasFragileUserData="true"` in the manifest
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 1e7a40cef2..032e256bfa 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
     <application
         android:name=".VectorApplication"
         android:allowBackup="false"
+        android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -85,6 +86,7 @@
         android:supportsRtl="true"
         android:taskAffinity="${applicationId}.${appTaskAffinitySuffix}"
         android:theme="@style/Theme.Vector.Light"
+        tools:ignore="UnusedAttribute"
         tools:replace="android:allowBackup">
 
         <!-- No limit for screen ratio: avoid black strips -->
@@ -413,9 +415,9 @@
 
         <!-- UnifiedPush -->
         <receiver
-            android:exported="true"
+            android:name=".core.pushers.VectorMessagingReceiver"
             android:enabled="true"
-            android:name=".core.pushers.VectorMessagingReceiver">
+            android:exported="true">
             <intent-filter>
                 <action android:name="org.unifiedpush.android.connector.MESSAGE" />
                 <action android:name="org.unifiedpush.android.connector.UNREGISTERED" />