diff --git a/app/src/main/java/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt b/app/src/main/java/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt
index 006a9ea3f..4656ca09c 100644
--- a/app/src/main/java/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt
@@ -63,7 +63,7 @@ class EntityGridVehicleScreen(
             val gridItem =
                 GridItem.Builder()
                     .setLoading(false)
-                    .setTitle(entity.friendlyName)
+                    .setTitle(entity.friendlyName.ifEmpty { entity.entityId })
                     .setText(entity.friendlyState(carContext))
 
             if (entity.isExecuting()) {