diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
index bc0d3bc58a..da4c222fd6 100644
--- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
@@ -548,8 +548,14 @@ public class ChatMessageManager
 	{
 		if (!queuedMessages.isEmpty())
 		{
-			queuedMessages.forEach(this::add);
-			queuedMessages.clear();
+			try
+			{
+				queuedMessages.forEach(this::add);
+			}
+			finally
+			{
+				queuedMessages.clear();
+			}
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/chat/QueuedMessage.java b/runelite-client/src/main/java/net/runelite/client/chat/QueuedMessage.java
index 9c88826af7..f89ce84b43 100644
--- a/runelite-client/src/main/java/net/runelite/client/chat/QueuedMessage.java
+++ b/runelite-client/src/main/java/net/runelite/client/chat/QueuedMessage.java
@@ -26,12 +26,14 @@ package net.runelite.client.chat;
 
 import lombok.Builder;
 import lombok.Data;
+import lombok.NonNull;
 import net.runelite.api.ChatMessageType;
 
 @Data
 @Builder
 public class QueuedMessage
 {
+	@NonNull
 	private final ChatMessageType type;
 	private final String value;
 	private String name;