diff --git a/src/snek/static/message-list.js b/src/snek/static/message-list.js
index 68fc098..9f11453 100644
--- a/src/snek/static/message-list.js
+++ b/src/snek/static/message-list.js
@@ -230,7 +230,7 @@ class MessageList extends HTMLElement {
     let message = this.messageMap.get(data.uid);
     const newMessage = !!message;
     if (message) {
-        message.parentElement.removeChild(message);
+        message.parentElement?.removeChild(message);
     }
 
     if (!data.message) return
@@ -240,7 +240,7 @@ class MessageList extends HTMLElement {
     wrapper.innerHTML = data.html;
 
     if (message) {
-      message.updateMessage(...wrapper.firstElementChild._originalChildren);
+      message.updateMessage(...(wrapper.firstElementChild._originalChildren || wrapper.firstElementChild.children));
     } else {
         message = wrapper.firstElementChild;
         this.messageMap.set(data.uid, message);