From 4ea19b0dd39c527d66d5c9a6a0c1503ded8d58cc Mon Sep 17 00:00:00 2001
From: Lukas Harbarth <lukas.harbarth@sap.com>
Date: Mon, 5 Oct 2026 14:50:16 +0200
Subject: [PATCH] fix(MessageView): guard against null refs in transitionEnd
 rAF callback

---
 packages/main/src/components/MessageView/index.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/main/src/components/MessageView/index.tsx b/packages/main/src/components/MessageView/index.tsx
index cf530291a39..9880c6aad80 100644
--- a/packages/main/src/components/MessageView/index.tsx
+++ b/packages/main/src/components/MessageView/index.tsx
@@ -196,6 +196,9 @@ const MessageView = forwardRef<MessageViewDomRef, MessageViewPropTypes>((props,
     }
     if (transitionTrigger.current === 'btn') {
       requestAnimationFrame(() => {
+        if (!listRef.current || !prevSelectedMessage.current) {
+          return;
+        }
         const selectedItem = listRef.current.querySelector<Ui5DomRef>(
           `[data-title="${CSS.escape(prevSelectedMessage.current.titleTextStr)}"]`,
         );