diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index 2e31e6ab21..121fc6ded3 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -552,13 +552,13 @@ class ThreadListFragment : TwoPaneFragment(), PickerEmojiObserver {
 
     private fun observeNetworkStatus() {
         viewLifecycleOwner.lifecycleScope.launch {
-            mainViewModel.isNetworkAvailable.collect { isNetworkAvailable ->
-                if (_binding == null) return@collect
-
-                TransitionManager.beginDelayedTransition(binding.root)
-                binding.noNetwork.isGone = isNetworkAvailable
-                binding.updatedAt.isGone = !isNetworkAvailable
-                if (!isNetworkAvailable) updateThreadsVisibility()
+            repeatOnLifecycle(State.STARTED) {
+                mainViewModel.isNetworkAvailable.collect { isNetworkAvailable ->
+                    TransitionManager.beginDelayedTransition(binding.root)
+                    binding.noNetwork.isGone = isNetworkAvailable
+                    binding.updatedAt.isGone = !isNetworkAvailable
+                    if (!isNetworkAvailable) updateThreadsVisibility()
+                }
             }
         }
     }