diff --git a/src/snek/static/message-list.js b/src/snek/static/message-list.js
index 47ea3c4..a445f15 100644
--- a/src/snek/static/message-list.js
+++ b/src/snek/static/message-list.js
@@ -277,8 +277,10 @@ class MessageList extends HTMLElement {
 
   upsertMessage(data) {
     let message = this.messageMap.get(data.uid);
-    if (message && data.is_final) {
+    if ((message && data.is_final) || !data.message) {
       message.parentElement?.removeChild(message);
+      message = null;
+      
     }
     if (!data.message) return;