diff --git a/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in b/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
index 64a2b633ac1..bec0ad8e0bb 100644
--- a/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
+++ b/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
@@ -4,6 +4,7 @@
             android:screenOrientation="portrait"
             android:configChanges="orientation"
             android:windowSoftInputMode="adjustResize|stateHidden"
+            android:taskAffinity="org.mozilla.gecko.sync.setup"
             android:name="org.mozilla.gecko.sync.setup.activities.SetupSyncActivity" >
             <!-- android:configChanges: SetupSyncActivity will handle orientation changes; no longer restarts activity (default) -->
             <intent-filter>