diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 57cebb9e1..0c0217f5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -76,6 +76,9 @@ class ChallengeListFragment :
         savedInstanceState: Bundle?
     ) {
         super.onViewCreated(view, savedInstanceState)
+        if (savedInstanceState?.containsKey("viewUserChallengesOnly") == true) {
+            viewUserChallengesOnly = savedInstanceState.getBoolean("viewUserChallengesOnly")
+        }
 
         challengeAdapter = ChallengesListViewAdapter(viewUserChallengesOnly, userViewModel.userID)
         challengeAdapter?.onOpenChallengeFragment = { openDetailFragment(it) }
@@ -129,6 +132,12 @@ class ChallengeListFragment :
         retrieveChallengesPage(true)
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putBoolean("viewUserChallengesOnly", viewUserChallengesOnly)
+        super.onSaveInstanceState(outState)
+
+    }
+
     private fun openDetailFragment(challengeID: String) {
         MainNavigationController.navigate(
             ChallengesOverviewFragmentDirections.openChallengeDetail(