diff --git a/app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt b/app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt
index b8438a1..9d15f05 100644
--- a/app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt
+++ b/app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt
@@ -780,14 +780,14 @@ fun MergedTrainRecordItem(
                                         when {
                                             latestTrain.isNotEmpty() && latestTrain != "<NUL>" && 
                                             recordTrain.isNotEmpty() && recordTrain != "<NUL>" && 
-                                            latestTrain == recordTrain -> {
+                                            latestTrain == recordTrain && latestLoco != recordLoco -> {
                                                 if (recordLoco.isNotEmpty() && recordLoco != "<NUL>") {
                                                     "${recordItem.locoType}-${recordLoco}"
                                                 } else null
                                             }
                                             latestLoco.isNotEmpty() && latestLoco != "<NUL>" && 
                                             recordLoco.isNotEmpty() && recordLoco != "<NUL>" && 
-                                            latestLoco == recordLoco -> {
+                                            latestLoco == recordLoco && latestTrain != recordTrain -> {
                                                 if (recordTrain.isNotEmpty() && recordTrain != "<NUL>") {
                                                     recordTrain
                                                 } else null