diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/KSuiteDashboardFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/KSuiteDashboardFragment.kt
index 9f0b0907d8..b027fb2570 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/KSuiteDashboardFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/KSuiteDashboardFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import androidx.fragment.app.viewModels
 import com.infomaniak.core.myksuite.ui.views.MyKSuiteDashboardFragment
 import com.infomaniak.mail.utils.MyKSuiteUiUtils.getDashboardData
+import com.infomaniak.mail.utils.extensions.observeNotNull
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import com.infomaniak.core.myksuite.R as RMyKSuite
@@ -37,8 +38,8 @@ class KSuiteDashboardFragment : MyKSuiteDashboardFragment() {
         setSystemBarsColors(statusBarColor = RMyKSuite.color.dashboardBackground)
 
         myKSuiteViewModel.refreshMyKSuite()
-        myKSuiteViewModel.myKSuiteDataResult.observe(viewLifecycleOwner) { myKSuiteData ->
-            myKSuiteData?.let { data -> resetContent(dashboardData = getDashboardData(requireContext(), data)) }
+        myKSuiteViewModel.myKSuiteDataResult.observeNotNull(viewLifecycleOwner) { myKSuiteData ->
+            resetContent(dashboardData = getDashboardData(requireContext(), myKSuiteData))
         }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
index 9421a56ade..c7169c29c3 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
@@ -115,7 +115,7 @@ class SettingsFragment : Fragment() {
     }
 
     private fun observeMyKSuiteData() {
-        myKSuiteViewModel.myKSuiteDataResult.observe(viewLifecycleOwner) { data -> data?.let(::setupMyKSuiteLayout) }
+        myKSuiteViewModel.myKSuiteDataResult.observeNotNull(viewLifecycleOwner) { data -> setupMyKSuiteLayout(data) }
     }
 
     override fun onResume() {