diff --git a/src/user/chat.rs b/src/user/chat.rs
index b3431b8..a94e039 100644
--- a/src/user/chat.rs
+++ b/src/user/chat.rs
@@ -368,9 +368,10 @@ impl PaneState {
     }
 
     fn pop_line(&mut self) {
-        self.lines.pop();
-        self.markers.pop();
-        self.scroll.invalidate_from(self.lines.len());
+        if self.lines.pop().is_some() {
+            self.markers.pop();
+            self.scroll.invalidate_from(self.lines.len());
+        }
     }
 
     fn scroll_up(&mut self, n: u16) {