diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/startup/StartupViewModel.kt b/app/src/main/java/org/jellyfin/androidtv/ui/startup/StartupViewModel.kt
index 4f5f150a93..d38c98ae6b 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/startup/StartupViewModel.kt
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/startup/StartupViewModel.kt
@@ -66,9 +66,12 @@ class StartupViewModel(
 	fun getUserImage(server: Server, user: User): String? =
 		authenticationRepository.getUserImageUrl(server, user)
 
-	fun reloadServers() {
+	fun reloadServers(ignoreDiscovery: Boolean = false) {
 		viewModelScope.launch { serverRepository.loadStoredServers() }
-		viewModelScope.launch(Dispatchers.IO) { serverRepository.loadDiscoveryServers() }
+
+		if (!ignoreDiscovery) {
+			viewModelScope.launch(Dispatchers.IO) { serverRepository.loadDiscoveryServers() }
+		}
 	}
 
 	suspend fun getLastServer(): Server? {
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/startup/fragment/ServerFragment.kt b/app/src/main/java/org/jellyfin/androidtv/ui/startup/fragment/ServerFragment.kt
index 2696e12f42..ef18968045 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/startup/fragment/ServerFragment.kt
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/startup/fragment/ServerFragment.kt
@@ -171,7 +171,7 @@ class ServerFragment : Fragment() {
 	override fun onResume() {
 		super.onResume()
 
-		startupViewModel.reloadServers()
+		startupViewModel.reloadServers(ignoreDiscovery = true)
 		backgroundService.clearBackgrounds()
 
 		val server = serverIdArgument?.let(startupViewModel::getServer)