diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index 466f0caf4..bab2656fa 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -452,6 +452,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
   const showUrlPreview = room.hasEncryptionStateEvent() ? encUrlPreview : urlPreview;
   const [showHiddenEvents] = useSetting(settingsAtom, 'showHiddenEvents');
   const [showDeveloperTools] = useSetting(settingsAtom, 'developerTools');
+  const [lotusTerminal] = useSetting(settingsAtom, 'lotusTerminal');
 
   const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock');
   const [dateFormatString] = useSetting(settingsAtom, 'dateFormatString');
@@ -1112,6 +1113,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
             legacyUsernameColor={legacyUsernameColor || direct}
             hour24Clock={hour24Clock}
             dateFormatString={dateFormatString}
+            lotusTerminal={!!lotusTerminal}
           >
             {mEvent.isRedacted() ? (
               <RedactedContent reason={mEvent.getUnsigned().redacted_because?.content.reason} />
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 44fe99a28..b8e714225 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -726,6 +726,7 @@ export type MessageProps = {
   legacyUsernameColor?: boolean;
   hour24Clock: boolean;
   dateFormatString: string;
+  lotusTerminal?: boolean;
 };
 export const Message = React.memo(as<'div', MessageProps>(
   (
@@ -757,6 +758,7 @@ export const Message = React.memo(as<'div', MessageProps>(
       legacyUsernameColor,
       hour24Clock,
       dateFormatString,
+      lotusTerminal: lotusTerminalProp,
       children,
       ...props
     },
@@ -770,7 +772,7 @@ export const Message = React.memo(as<'div', MessageProps>(
       ? []
       : (readPositions.get(mEvent.getId() ?? '') ?? []);
     const isMine = mEvent.getSender() === mx.getUserId();
-    const [lotusTerminal] = useSetting(settingsAtom, 'lotusTerminal');
+    const lotusTerminal = lotusTerminalProp;
 
     const [hover, setHover] = useState(false);
     const { hoverProps } = useHover({ onHoverChange: setHover });