diff --git a/ui/user/src/lib/services/chat/messages.ts b/ui/user/src/lib/services/chat/messages.ts
index 6497b9bb1b..454cc9eb79 100644
--- a/ui/user/src/lib/services/chat/messages.ts
+++ b/ui/user/src/lib/services/chat/messages.ts
@@ -189,6 +189,11 @@ export function buildMessagesFromProgress(
 				item.message = [];
 			}
 		}
+
+		// Drop aborted message if previous message was also aborted
+		if (i > 0 && item.aborted && !item.ignore && messages.messages[i - 1].aborted) {
+			messages.messages[i - 1].ignore = true;
+		}
 	});
 
 	return messages;