diff --git a/app/src/main/java/audio/funkwhale/ffa/activities/MainActivity.kt b/app/src/main/java/audio/funkwhale/ffa/activities/MainActivity.kt
index 14d8939..b3e2d68 100644
--- a/app/src/main/java/audio/funkwhale/ffa/activities/MainActivity.kt
+++ b/app/src/main/java/audio/funkwhale/ffa/activities/MainActivity.kt
@@ -16,6 +16,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.SeekBar
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
@@ -207,6 +208,21 @@ class MainActivity : AppCompatActivity() {
     return true
   }
 
+  var resultLauncher = registerForActivityResult(StartActivityForResult()) { result ->
+    if (result.resultCode == ResultCode.LOGOUT.code) {
+      Intent(this, LoginActivity::class.java).apply {
+        FFA.get().deleteAllData(this@MainActivity)
+
+        flags =
+          Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+
+        stopService(Intent(this@MainActivity, PlayerService::class.java))
+        startActivity(this)
+        finish()
+      }
+    }
+  }
+
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     when (item.itemId) {
       android.R.id.home -> {
@@ -279,29 +295,12 @@ class MainActivity : AppCompatActivity() {
         }
       }
       R.id.nav_downloads -> startActivity(Intent(this, DownloadsActivity::class.java))
-      R.id.settings -> startActivityForResult(Intent(this, SettingsActivity::class.java), 0)
+      R.id.settings -> resultLauncher.launch(Intent(this, SettingsActivity::class.java))
     }
 
     return true
   }
 
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-    super.onActivityResult(requestCode, resultCode, data)
-
-    if (resultCode == ResultCode.LOGOUT.code) {
-      Intent(this, LoginActivity::class.java).apply {
-        FFA.get().deleteAllData(this@MainActivity)
-
-        flags =
-          Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-
-        stopService(Intent(this@MainActivity, PlayerService::class.java))
-        startActivity(this)
-        finish()
-      }
-    }
-  }
-
   private fun launchFragment(fragment: Fragment) {
     supportFragmentManager.fragments.lastOrNull()?.also { oldFragment ->
       oldFragment.enterTransition = null