diff --git a/app/src/main/java/io/homeassistant/companion/android/vehicle/MainVehicleScreen.kt b/app/src/main/java/io/homeassistant/companion/android/vehicle/MainVehicleScreen.kt
index 797e30fb192..4d5dc3728ba 100644
--- a/app/src/main/java/io/homeassistant/companion/android/vehicle/MainVehicleScreen.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/vehicle/MainVehicleScreen.kt
@@ -122,7 +122,8 @@ class MainVehicleScreen(
                 setLoading(true)
             }.build()
         }
-        val listBuilder = if (favoritesList.isNotEmpty()) {
+        val serverHasFavorites = favoritesList.any { it.split("-")[0].toIntOrNull() == serverId.value }
+        val listBuilder = if (serverHasFavorites) {
             EntityGridVehicleScreen(
                 carContext,
                 serverManager,