diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/CustomInstanceDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/CustomInstanceDialog.kt
index f9a4befde..e2a5a41eb 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/CustomInstanceDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/CustomInstanceDialog.kt
@@ -3,6 +3,7 @@ package com.github.libretube.ui.dialogs
 import android.app.Dialog
 import android.os.Bundle
 import android.widget.Toast
+import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogCustomInstanceBinding
@@ -43,7 +44,7 @@ class CustomInstanceDialog : DialogFragment() {
                         Database.customInstanceDao().insertAll(customInstance)
                     }
 
-                    activity?.recreate()
+                    ActivityCompat.recreate(requireActivity())
                     dismiss()
                 } catch (e: Exception) {
                     // invalid URL
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt
index 89d1e5ae1..c08746e62 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt
@@ -4,6 +4,7 @@ import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
+import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
@@ -51,7 +52,7 @@ class DeleteAccountDialog : DialogFragment() {
             Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
 
             PreferenceHelper.setToken("")
-            activity?.recreate()
+            ActivityCompat.recreate(requireActivity())
             dialog?.dismiss()
         }
     }
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
index b6287ce05..5281ed074 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
@@ -4,6 +4,7 @@ import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
+import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
@@ -96,7 +97,7 @@ class LoginDialog : DialogFragment() {
             PreferenceHelper.setUsername(login.username)
 
             dialog?.dismiss()
-            activity?.recreate()
+            ActivityCompat.recreate(requireActivity())
         }
     }
 
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt
index a03ff7678..72f7d730b 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.os.Bundle
 import android.widget.Toast
+import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogLogoutBinding
@@ -25,7 +26,7 @@ class LogoutDialog : DialogFragment() {
             Toast.makeText(context, R.string.loggedout, Toast.LENGTH_SHORT).show()
             PreferenceHelper.setToken("")
             dialog?.dismiss()
-            activity?.recreate()
+            ActivityCompat.recreate(requireActivity())
         }
 
         return MaterialAlertDialogBuilder(requireContext())
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt
index 51b952828..5011d2657 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt
@@ -2,6 +2,7 @@ package com.github.libretube.ui.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
+import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.util.NavigationHelper
@@ -14,7 +15,7 @@ class RequireRestartDialog : DialogFragment() {
             .setTitle(R.string.require_restart)
             .setMessage(R.string.require_restart_message)
             .setPositiveButton(R.string.okay) { _, _ ->
-                activity?.recreate()
+                ActivityCompat.recreate(requireActivity())
                 NavigationHelper.restartMainActivity(requireContext())
             }
             .setNegativeButton(R.string.cancel, null)
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt
index c888debeb..3c92363c8 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt
@@ -1,6 +1,7 @@
 package com.github.libretube.ui.preferences
 
 import android.os.Bundle
+import androidx.core.app.ActivityCompat
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import com.github.libretube.R
@@ -41,7 +42,7 @@ class AdvancedSettings : BasePreferenceFragment() {
                 // clear login token
                 PreferenceHelper.setToken("")
 
-                activity?.recreate()
+                ActivityCompat.recreate(requireActivity())
             }
             .show()
     }
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt
index d42d7da5e..da14044ea 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt
@@ -2,6 +2,7 @@ package com.github.libretube.ui.preferences
 
 import android.os.Bundle
 import android.widget.Toast
+import androidx.core.app.ActivityCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.ListPreference
 import androidx.preference.Preference
@@ -37,7 +38,7 @@ class InstanceSettings : BasePreferenceFragment() {
                 logout()
             }
             RetrofitInstance.lazyMgr.reset()
-            activity?.recreate()
+            ActivityCompat.recreate(requireActivity())
             true
         }
 
@@ -52,7 +53,7 @@ class InstanceSettings : BasePreferenceFragment() {
             RetrofitInstance.authUrl = newValue.toString()
             RetrofitInstance.lazyMgr.reset()
             logout()
-            activity?.recreate()
+            ActivityCompat.recreate(requireActivity())
             true
         }
 
@@ -68,7 +69,7 @@ class InstanceSettings : BasePreferenceFragment() {
                 authInstance.value
             }
             RetrofitInstance.lazyMgr.reset()
-            activity?.recreate()
+            ActivityCompat.recreate(requireActivity())
             true
         }
 
@@ -84,7 +85,7 @@ class InstanceSettings : BasePreferenceFragment() {
             awaitQuery {
                 Database.customInstanceDao().deleteAll()
             }
-            activity?.recreate()
+            ActivityCompat.recreate(requireActivity())
             true
         }