diff --git a/app/src/main/java/com/aurora/store/view/ui/apps/AppsContainerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/apps/AppsContainerFragment.kt
index af8fed4d5..55fdc4987 100644
--- a/app/src/main/java/com/aurora/store/view/ui/apps/AppsContainerFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/apps/AppsContainerFragment.kt
@@ -58,7 +58,7 @@ class AppsContainerFragment : Fragment(R.layout.fragment_apps_games) {
 
         binding.pager.adapter = ViewPagerAdapter(
             childFragmentManager,
-            lifecycle,
+            viewLifecycleOwner.lifecycle,
             isGoogleAccount,
             isForYouEnabled
         )
@@ -94,6 +94,7 @@ class AppsContainerFragment : Fragment(R.layout.fragment_apps_games) {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        binding.pager.adapter = null
         _binding = null
     }
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/TopChartContainerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/TopChartContainerFragment.kt
index c43ea54a2..7b4ea1fa5 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/TopChartContainerFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/TopChartContainerFragment.kt
@@ -59,7 +59,8 @@ class TopChartContainerFragment : Fragment(R.layout.fragment_top_chart) {
         }
 
         // ViewPager
-        binding.pager.adapter = ViewPagerAdapter(childFragmentManager, lifecycle, chartType)
+        binding.pager.adapter =
+            ViewPagerAdapter(childFragmentManager, viewLifecycleOwner.lifecycle, chartType)
         binding.topTabGroup.setOnCheckedStateChangeListener { _, checkedIds ->
             when (checkedIds[0]) {
                 R.id.tab_top_free -> binding.pager.setCurrentItem(0, true)
@@ -84,6 +85,7 @@ class TopChartContainerFragment : Fragment(R.layout.fragment_top_chart) {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        binding.pager.adapter = null
         _binding = null
     }
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/games/GamesContainerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/games/GamesContainerFragment.kt
index aeb9227ef..e600f6be1 100644
--- a/app/src/main/java/com/aurora/store/view/ui/games/GamesContainerFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/games/GamesContainerFragment.kt
@@ -58,7 +58,7 @@ class GamesContainerFragment : Fragment(R.layout.fragment_apps_games) {
 
         binding.pager.adapter = ViewPagerAdapter(
             childFragmentManager,
-            lifecycle,
+            viewLifecycleOwner.lifecycle,
             isGoogleAccount,
             isForYouEnabled
         )
@@ -93,6 +93,7 @@ class GamesContainerFragment : Fragment(R.layout.fragment_apps_games) {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        binding.pager.adapter = null
         _binding = null
     }
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofFragment.kt b/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofFragment.kt
index 438a33d2f..ee1dcd9f8 100644
--- a/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofFragment.kt
@@ -90,7 +90,7 @@ class SpoofFragment : Fragment(R.layout.activity_generic_pager) {
         }
 
         // ViewPager
-        binding.pager.adapter = ViewPagerAdapter(childFragmentManager, lifecycle)
+        binding.pager.adapter = ViewPagerAdapter(childFragmentManager, viewLifecycleOwner.lifecycle)
 
         TabLayoutMediator(
             binding.tabLayout,
@@ -108,6 +108,7 @@ class SpoofFragment : Fragment(R.layout.activity_generic_pager) {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        binding.pager.adapter = null
         _binding = null
     }