diff --git a/src/components/common/messaging/Message.tsx b/src/components/common/messaging/Message.tsx
index e7521660..76c3afc1 100644
--- a/src/components/common/messaging/Message.tsx
+++ b/src/components/common/messaging/Message.tsx
@@ -159,7 +159,8 @@ const Message = observer(
                                 />
                             </span>
                         )}
-                        {replacement ?? <Markdown content={content} />}
+                        {replacement ??
+                            (content && <Markdown content={content} />)}
                         {!queued && <InviteList message={message} />}
                         {queued?.error && (
                             <Category>
diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx
index 8a130362..cd3dc4b5 100644
--- a/src/components/common/messaging/attachments/MessageReply.tsx
+++ b/src/components/common/messaging/attachments/MessageReply.tsx
@@ -221,13 +221,15 @@ export const MessageReply = observer(
                                             </em>
                                         </>
                                     )}
-                                    <Markdown
-                                        disallowBigEmoji
-                                        content={message.content?.replace(
-                                            /\n/g,
-                                            " ",
-                                        )}
-                                    />
+                                    {message.content && (
+                                        <Markdown
+                                            disallowBigEmoji
+                                            content={message.content.replace(
+                                                /\n/g,
+                                                " ",
+                                            )}
+                                        />
+                                    )}
                                 </div>
                             </>
                         )}
diff --git a/src/components/common/messaging/bars/ReplyBar.tsx b/src/components/common/messaging/bars/ReplyBar.tsx
index c2d08e20..5c7ab374 100644
--- a/src/components/common/messaging/bars/ReplyBar.tsx
+++ b/src/components/common/messaging/bars/ReplyBar.tsx
@@ -185,13 +185,15 @@ export default observer(({ channel, replies, setReplies }: Props) => {
                                             hideInfo
                                         />
                                     ) : (
-                                        <Markdown
-                                            disallowBigEmoji
-                                            content={message.content?.replace(
-                                                /\n/g,
-                                                " ",
-                                            )}
-                                        />
+                                        message.content && (
+                                            <Markdown
+                                                disallowBigEmoji
+                                                content={message.content.replace(
+                                                    /\n/g,
+                                                    " ",
+                                                )}
+                                            />
+                                        )
                                     )}
                                 </div>
                             </div>
diff --git a/src/controllers/modals/components/legacy/UserProfile.tsx b/src/controllers/modals/components/legacy/UserProfile.tsx
index a7cc7f8e..0ec0eebd 100644
--- a/src/controllers/modals/components/legacy/UserProfile.tsx
+++ b/src/controllers/modals/components/legacy/UserProfile.tsx
@@ -322,13 +322,17 @@ export const UserProfile = observer(
                                     />
                                 )}
                                 {profile?.content && (
-                                    <div className={styles.category}>
-                                        <Text id="app.special.popovers.user_profile.sub.information" />
-                                    </div>
+                                    <>
+                                        <div className={styles.category}>
+                                            <Text id="app.special.popovers.user_profile.sub.information" />
+                                        </div>
+                                        <div className={styles.markdown}>
+                                            <Markdown
+                                                content={profile.content}
+                                            />
+                                        </div>
+                                    </>
                                 )}
-                                <div className={styles.markdown}>
-                                    <Markdown content={profile?.content} />
-                                </div>
                                 {/*<div className={styles.category}><Text id="app.special.popovers.user_profile.sub.connections" /></div>*/}
                             </div>
                         ) : (