diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index 4e6aedecc..005ee46e9 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -1155,7 +1155,13 @@ function _Chat() {
                       {isUser ? (
                         <Avatar avatar={config.avatar} />
                       ) : (
-                        <MaskAvatar mask={session.mask} />
+                        <>
+                          {["system", "context"].includes(message.role) ? (
+                            <Avatar avatar="2699-fe0f" />
+                          ) : (
+                            <MaskAvatar mask={session.mask} />
+                          )}
+                        </>
                       )}
                     </div>