diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index da49e3702..5a1956fa0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -196,13 +196,11 @@
 
         <activity
             android:name=".location.LocationPickerActivity"
-            android:theme="@style/AppTheme"
-            android:noHistory="true"/>
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name=".location.GeocodingActivity"
-            android:theme="@style/AppTheme"
-            android:noHistory="true"/>
+            android:theme="@style/AppTheme" />
 
         <receiver android:name=".receivers.PackageReplacedReceiver"
             android:exported="false">
diff --git a/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt b/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt
index e22562978..cf36d04d2 100644
--- a/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt
@@ -115,6 +115,7 @@ class GeocodingActivity :
             val geocodingResult = GeocodingResult(address.latitude, address.longitude, address.displayName)
 
             val intent = Intent(this, LocationPickerActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             intent.putExtra(BundleKeys.KEY_ROOM_TOKEN, roomToken)
             intent.putExtra(BundleKeys.KEY_GEOCODING_RESULT, geocodingResult)
             startActivity(intent)
@@ -197,6 +198,7 @@ class GeocodingActivity :
 
                 override fun onMenuItemActionCollapse(menuItem: MenuItem): Boolean {
                     val intent = Intent(context, LocationPickerActivity::class.java)
+                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
                     intent.putExtra(BundleKeys.KEY_ROOM_TOKEN, roomToken)
                     startActivity(intent)
                     return true