diff --git a/chat/components/chat.templ b/chat/components/chat.templ
index 326bd3e..f2d02fe 100644
--- a/chat/components/chat.templ
+++ b/chat/components/chat.templ
@@ -23,21 +23,16 @@ type Config struct {
 	StopKeyPropagation bool
 }
 
-// ChatMessage renders a single chat message. Used for appending new messages via SSE.
-templ ChatMessage(m chat.Message, cfg Config) {
-	<div class={ cfg.CSSPrefix + "-chat-msg" }>
-		<span style={ fmt.Sprintf("color:%s;font-weight:bold;", cfg.Color(m.Slot)) }>
-			{ m.Nickname + ": " }
-		</span>
-		<span>{ m.Message }</span>
-	</div>
-}
-
 templ Chat(messages []chat.Message, cfg Config) {
 	<div id={ cfg.CSSPrefix + "-chat" } class={ cfg.CSSPrefix + "-chat" }>
-		<div id={ cfg.CSSPrefix + "-chat-history" } class={ cfg.CSSPrefix + "-chat-history" }>
+		<div class={ cfg.CSSPrefix + "-chat-history" }>
 			for _, m := range messages {
-				@ChatMessage(m, cfg)
+				<div class={ cfg.CSSPrefix + "-chat-msg" }>
+					<span style={ fmt.Sprintf("color:%s;font-weight:bold;", cfg.Color(m.Slot)) }>
+						{ m.Nickname + ": " }
+					</span>
+					<span>{ m.Message }</span>
+				</div>
 			}
 		</div>
 		<div class={ cfg.CSSPrefix + "-chat-input" } data-morph-ignore>
diff --git a/features/c4game/handlers.go b/features/c4game/handlers.go
index be6c09b..c5a5bc0 100644
--- a/features/c4game/handlers.go
+++ b/features/c4game/handlers.go
@@ -148,13 +148,8 @@ func HandleGameEvents(store *connect4.Store, nc *nats.Conn, sm *scs.SessionManag
 					return
 				}
 			case msg := <-chatCh:
-				chatMsg, _ := room.Receive(msg.Data)
-				err := sse.PatchElementTempl(
-					chatcomponents.ChatMessage(chatMsg, chatCfg),
-					datastar.WithSelectorID("c4-chat-history"),
-					datastar.WithModeAppend(),
-				)
-				if err != nil {
+				room.Receive(msg.Data)
+				if err := patchAll(); err != nil {
 					return
 				}
 			}
diff --git a/features/snakegame/handlers.go b/features/snakegame/handlers.go
index 7a96ed4..dffb6a0 100644
--- a/features/snakegame/handlers.go
+++ b/features/snakegame/handlers.go
@@ -172,13 +172,8 @@ func HandleSnakeEvents(snakeStore *snake.SnakeStore, nc *nats.Conn, sm *scs.Sess
 				if msg == nil {
 					continue
 				}
-				chatMsg, _ := room.Receive(msg.Data)
-				err := sse.PatchElementTempl(
-					chatcomponents.ChatMessage(chatMsg, chatCfg),
-					datastar.WithSelectorID("snake-chat-history"),
-					datastar.WithModeAppend(),
-				)
-				if err != nil {
+				room.Receive(msg.Data)
+				if err := patchAll(); err != nil {
 					return
 				}
 			}