diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
index f52bceb..6656b86 100644
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@@ -17,7 +17,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.doOnNextLayout
 import androidx.drawerlayout.widget.DrawerLayout
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.*
 import androidx.room.Room
 import androidx.work.Constraints
@@ -179,12 +178,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         dataBase = AndroidDeviceDatabase(applicationContext)
 
-        lifecycleScope.launch {
-            repository.toastMessageState.collect {
-                Toast.makeText(baseContext, it, Toast.LENGTH_SHORT).show()
-            }
-        }
-
         handleBottomBar()
         handleDrawer()
 
diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
index d2d6600..a29b924 100644
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
@@ -10,9 +10,6 @@ import com.russhwolf.settings.Settings
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
 class Repository(private val api: SelfossApi, private val apiDetails: ApiDetailsService, val connectivityStatus: ConnectivityStatus) {
@@ -21,9 +18,6 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     var items = ArrayList<SelfossModel.Item>()
     private val isConnectionAvailable = connectivityStatus.isNetworkConnected
 
-    private val _toastMessageState = MutableSharedFlow<String>(0)
-    val toastMessageState = _toastMessageState.asSharedFlow()
-
     var baseUrl = apiDetails.getBaseUrl()
     lateinit var dateUtils: DateUtils
 
@@ -50,13 +44,6 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
             updateApiVersion()
             dateUtils = DateUtils(apiMajorVersion)
             reloadBadges()
-
-            isConnectionAvailable.asStateFlow().collect { connectionAvailable ->
-                if (!connectionAvailable) {
-                    // TODO: Localize this string
-                    _toastMessageState.emit("Network connection lost")
-                }
-            }
         }
     }