diff --git a/CHANGES.md b/CHANGES.md
index d9ab78db82..320df0b6e7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,7 @@ Bugfix 🐛:
  - Very long topic cannot be fully visible (#1957)
  - Properly detect cross signing keys reset
  - Don't set presence when handling a push notification or polling (#2156)
+ - Be robust against `StrandHogg` task injection
 
 Translations 🗣:
  - Move store data to `/fastlane/metadata/android` (#812)
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index bfd09a65dc..643d5599de 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -63,6 +63,8 @@
 
         <activity
             android:name=".features.MainActivity"
+            android:launchMode="singleTask"
+            android:taskAffinity=""
             android:theme="@style/AppTheme.Launcher" />
 
         <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->