1 files changed, 6 insertions, 3 deletions
diff --git a/src/views/macaw/open_chats_panel.rs b/src/views/macaw/open_chats_panel.rs
index ddc9ec9..bdb0084 100644
--- a/src/views/macaw/open_chats_panel.rs
+++ b/src/views/macaw/open_chats_panel.rs
@@ -57,13 +57,16 @@ mod open_chat {
 
     #[component]
     pub fn OpenChatView(chat: MacawChat) -> impl IntoView {
-        let chat_jid = move || chat.chat.try_get_value().unwrap().get().correspondent().get();
-
         view! {
             <div class="open-chat-view">
                 <ChatViewHeader chat=chat.clone() />
                 <MessageHistoryBuffer chat=chat.clone() />
-                <ChatViewMessageComposer chat=chat_jid() />
+                {move || {
+                    let chat_jid = chat.get().correspondent().get();
+                    view! {
+                        <ChatViewMessageComposer chat=chat_jid />
+                    }
+                }}
             </div>
         }
     }