diff --git a/web/src/postprocess_content.ts b/web/src/postprocess_content.ts
index 78d564a430..7a3ecb7978 100644
--- a/web/src/postprocess_content.ts
+++ b/web/src/postprocess_content.ts
@@ -198,15 +198,6 @@ export function postprocess_content(html: string): string {
         }
     }
 
-    for (const audio of template.content.querySelectorAll("audio")) {
-        const audio_wrapper = inertDocument.createElement("span");
-        audio_wrapper.classList.add("media-audio-wrapper");
-        // We want a class to refer to audio elements
-        audio.classList.add("media-audio-element");
-        audio_wrapper.append(audio.cloneNode());
-        audio.replaceWith(audio_wrapper);
-    }
-
     for (const ol of template.content.querySelectorAll("ol")) {
         const list_start = Number(ol.getAttribute("start") ?? 1);
         // We don't count the first item in the list, as it
diff --git a/web/src/rendered_markdown.ts b/web/src/rendered_markdown.ts
index 05c9fd9e0b..e0932f2f16 100644
--- a/web/src/rendered_markdown.ts
+++ b/web/src/rendered_markdown.ts
@@ -5,6 +5,7 @@ import assert from "minimalistic-assert";
 
 import render_channel_message_link from "../templates/channel_message_link.hbs";
 import code_buttons_container from "../templates/code_buttons_container.hbs";
+import render_markdown_audio from "../templates/markdown_audio.hbs";
 import render_markdown_timestamp from "../templates/markdown_timestamp.hbs";
 import render_mention_content_wrapper from "../templates/mention_content_wrapper.hbs";
 import render_topic_link from "../templates/topic_link.hbs";
@@ -369,6 +370,20 @@ export const update_elements = ($content: JQuery): void => {
         $codehilite.addClass("zulip-code-block");
     });
 
+    $content.find("audio").each(function (): void {
+        // We grab the audio source and title for
+        // inserting into the template
+        const audio_src = $(this).attr("src");
+        const audio_title = $(this).attr("title");
+
+        const rendered_audio = render_markdown_audio({
+            audio_src,
+            audio_title,
+        });
+
+        $(this).replaceWith($(rendered_audio));
+    });
+
     // Display emoji (including realm emoji) as text if
     // user_settings.emojiset is 'text'.
     if (user_settings.emojiset === "text") {
diff --git a/web/styles/rendered_markdown.css b/web/styles/rendered_markdown.css
index f8ebcb292b..ca8f072309 100644
--- a/web/styles/rendered_markdown.css
+++ b/web/styles/rendered_markdown.css
@@ -673,11 +673,18 @@
         display: grid;
     }
 
-    .media-audio-element {
+    .media-audio-wrapper {
         vertical-align: middle;
+        display: inline-flex;
+        align-items: center;
+        max-width: 100%;
+    }
+
+    .media-audio-element {
+        flex: 0 1 auto;
         /* Allow browser-native media players
            to resize in narrow viewports. */
-        max-width: 100%;
+        max-width: calc(100% - 30px);
     }
 
     .message_embed {
diff --git a/web/templates/markdown_audio.hbs b/web/templates/markdown_audio.hbs
new file mode 100644
index 0000000000..451f0c5394
--- /dev/null
+++ b/web/templates/markdown_audio.hbs
@@ -0,0 +1,5 @@
+{{~!-- --~}}
+<span class="media-audio-wrapper">
+    <audio controls="" preload="metadata" src="{{audio_src}}" title="{{audio_title}}" class="media-audio-element"></audio>
+</span>
+{{~!-- --~}}
diff --git a/web/tests/postprocess_content.test.cjs b/web/tests/postprocess_content.test.cjs
index 42cab72c19..19a1e0011a 100644
--- a/web/tests/postprocess_content.test.cjs
+++ b/web/tests/postprocess_content.test.cjs
@@ -43,8 +43,7 @@ run_test("postprocess_content", () => {
                 "</div>" +
                 '<div class="message_embed_description">All about us.</div>' +
                 "</div>" +
-                "</div>" +
-                '<p><audio controls preload="metadata" src="http://zulip.zulipdev.com/user_uploads/w/ha/tever/inline.mp3" title="inline.mp3"></audio></p>',
+                "</div>",
         ),
         '<a href="http://example.com" target="_blank" rel="noopener noreferrer" title="http://example.com/">good</a> ' +
             '<a href="http://zulip.zulipdev.com/user_uploads/w/ha/tever/file.png" target="_blank" rel="noopener noreferrer" title="translated: Download file.png">upload</a> ' +
@@ -75,8 +74,7 @@ run_test("postprocess_content", () => {
             "</div>" +
             '<div class="message_embed_description">All about us.</div>' +
             "</div>" +
-            "</div>" +
-            '<p><span class="media-audio-wrapper"><audio controls="" preload="metadata" src="http://zulip.zulipdev.com/user_uploads/w/ha/tever/inline.mp3" title="inline.mp3" class="media-audio-element"></audio></span></p>',
+            "</div>",
     );
 });
 
diff --git a/web/tests/rendered_markdown.test.cjs b/web/tests/rendered_markdown.test.cjs
index 92ac1f24b3..37383e2760 100644
--- a/web/tests/rendered_markdown.test.cjs
+++ b/web/tests/rendered_markdown.test.cjs
@@ -151,6 +151,7 @@ const get_content_element = () => {
     $content.set_find_results("div.spoiler-header", $array([]));
     $content.set_find_results("div.codehilite", $array([]));
     $content.set_find_results(".message_inline_video video", $array([]));
+    $content.set_find_results("audio", $array([]));
 
     set_message_for_message_content($content, undefined);
 
@@ -538,6 +539,35 @@ run_test("timestamp without time", () => {
     assert.equal($timestamp.text(), "never-been-set");
 });
 
+run_test("audio", ({mock_template}) => {
+    const audio_src = "http://zulip.zulipdev.com/user_uploads/w/ha/tever/inline.mp3";
+    const audio_title = "inline.mp3";
+
+    const $content = get_content_element();
+    const $audio = $.create("audio");
+    $audio.replaceWith = noop;
+    $audio.attr("src", audio_src);
+    $audio.attr("title", audio_title);
+
+    $content.set_find_results("audio", $array([$audio]));
+
+    let audio_html;
+    mock_template("markdown_audio.hbs", true, (data, html) => {
+        assert.deepEqual(data, {audio_src, audio_title});
+        audio_html = html;
+        return html;
+    });
+
+    rm.update_elements($content);
+
+    assert.equal(
+        audio_html,
+        '<span class="media-audio-wrapper">\n' +
+            '    <audio controls="" preload="metadata" src="http://zulip.zulipdev.com/user_uploads/w/ha/tever/inline.mp3" title="inline.mp3" class="media-audio-element"></audio>\n' +
+            "</span>",
+    );
+});
+
 run_test("timestamp", ({mock_template}) => {
     mock_template("markdown_timestamp.hbs", true, (data, html) => {
         assert.deepEqual(data, {text: "Thu, Jan 1, 1970, 12:00 AM"});