diff --git a/src/apps/chat/components/ChatMessageList.tsx b/src/apps/chat/components/ChatMessageList.tsx
index cb80755c6..73172eda0 100644
--- a/src/apps/chat/components/ChatMessageList.tsx
+++ b/src/apps/chat/components/ChatMessageList.tsx
@@ -292,6 +292,7 @@ export function ChatMessageList(props: {
             <ChatMessageMemoOrNot
               key={'msg-' + message.id}
               message={message}
+              workspaceContents={props.workspaceContents}
               // diffPreviousText={message === diffTargetMessage ? diffPrevText : undefined}
               fitScreen={props.fitScreen}
               hasInReferenceTo={composerHasInReferenceto}
diff --git a/src/apps/chat/components/message/ChatMessage.tsx b/src/apps/chat/components/message/ChatMessage.tsx
index 68d8871f9..392de5acf 100644
--- a/src/apps/chat/components/message/ChatMessage.tsx
+++ b/src/apps/chat/components/message/ChatMessage.tsx
@@ -88,6 +88,7 @@ export const ChatMessageMemo = React.memo(ChatMessage);
  */
 export function ChatMessage(props: {
   message: DMessage,
+  workspaceContents: WorkspaceContents | null,
   diffPreviousText?: string,
   fitScreen: boolean,
   hasInReferenceTo?: boolean;
diff --git a/src/apps/link-chat/LinkChatViewer.tsx b/src/apps/link-chat/LinkChatViewer.tsx
index 7bfed5762..244e05376 100644
--- a/src/apps/link-chat/LinkChatViewer.tsx
+++ b/src/apps/link-chat/LinkChatViewer.tsx
@@ -121,6 +121,7 @@ export function LinkChatViewer(props: { conversation: DConversation, storedAt: D
             {filteredMessages.map((message, idx) =>
               <ChatMessageMemo
                 key={'msg-' + message.id}
+                workspaceContents={null /* shared chat - no workspace */}
                 message={message}
                 fitScreen={isMobile}
                 isMobile={isMobile}
diff --git a/src/modules/beam/gather/Fusion.tsx b/src/modules/beam/gather/Fusion.tsx
index 5ae96b292..ce65ea402 100644
--- a/src/modules/beam/gather/Fusion.tsx
+++ b/src/modules/beam/gather/Fusion.tsx
@@ -143,6 +143,7 @@ export function Fusion(props: {
           {!!fusion.outputDMessage && (
             <ChatMessageMemo
               message={fusion.outputDMessage}
+              workspaceContents={null /* a single fusion, when done */}
               fitScreen={true}
               hideAvatar
               showUnsafeHtml={true}
diff --git a/src/modules/beam/gather/instructions/ChatGenerateInstruction.tsx b/src/modules/beam/gather/instructions/ChatGenerateInstruction.tsx
index ec04532b4..d555ba287 100644
--- a/src/modules/beam/gather/instructions/ChatGenerateInstruction.tsx
+++ b/src/modules/beam/gather/instructions/ChatGenerateInstruction.tsx
@@ -80,6 +80,7 @@ export async function executeChatGenerate(_i: ChatGenerateInstruction, inputs: E
         inputs.updateInstructionComponent(
           <ChatMessage
             message={inputs.intermediateDMessage}
+            workspaceContents={null /* this is a merge being generated, in progress */}
             fitScreen={true}
             hideAvatar
             adjustContentScaling={-1}
diff --git a/src/modules/beam/scatter/BeamRay.tsx b/src/modules/beam/scatter/BeamRay.tsx
index 04df51df3..af1227b47 100644
--- a/src/modules/beam/scatter/BeamRay.tsx
+++ b/src/modules/beam/scatter/BeamRay.tsx
@@ -206,6 +206,7 @@ export function BeamRay(props: {
           {!!ray.message && (
             <ChatMessageMemo
               message={ray.message}
+              workspaceContents={null /* a single ray being generated */}
               fitScreen={true}
               hideAvatar
               showUnsafeHtml={true}
diff --git a/src/modules/beam/scatter/BeamScatterInput.tsx b/src/modules/beam/scatter/BeamScatterInput.tsx
index 6e585f002..ab6eab347 100644
--- a/src/modules/beam/scatter/BeamScatterInput.tsx
+++ b/src/modules/beam/scatter/BeamScatterInput.tsx
@@ -89,6 +89,7 @@ export function BeamScatterInput(props: {
     <Box sx={BEAM_INVERT_BACKGROUND ? userMessageWrapperINVSx : userMessageWrapperSx}>
       <ChatMessageMemo
         message={lastHistoryMessage}
+        workspaceContents={null /* User Message (last message in history) */}
         fitScreen={props.isMobile}
         isMobile={props.isMobile}
         adjustContentScaling={-1}