diff --git a/internal/webserver/handler_messages.go b/internal/webserver/handler_messages.go
index 07b7f26..1eb4922 100644
--- a/internal/webserver/handler_messages.go
+++ b/internal/webserver/handler_messages.go
@@ -51,7 +51,6 @@ func (app *Application) message_detail(w http.ResponseWriter, r *http.Request) {
 	// First send a message, if applicable
 	if is_sending {
 		app.message_send(w, r)
-		app.buffered_render_htmx(w, "dm-composer", global_data, chat_view_data) // Wipe the chat box
 	}
 
 	// `LatestPollingTimestamp` sort of passes-through the function; if we're not updating it, it
diff --git a/internal/webserver/tpl/tweet_page_includes/chat_view.tpl b/internal/webserver/tpl/tweet_page_includes/chat_view.tpl
index b3f833a..7798502 100644
--- a/internal/webserver/tpl/tweet_page_includes/chat_view.tpl
+++ b/internal/webserver/tpl/tweet_page_includes/chat_view.tpl
@@ -147,8 +147,9 @@
           hx-target="#new-messages-poller"
           hx-swap="outerHTML scroll:.chat-messages:bottom"
           hx-ext="json-enc"
+          hx-on:htmx:after-request="composer.innerText = ''; realInput.value = ''; "
         >
-          {{template "dm-composer"}}
+          <span id="composer" role="textbox" contenteditable oninput="realInput.value = this.innerText"></span>
           <input id="realInput" type="hidden" name="text" value="" />
           <input type="submit" />
         </form>
@@ -246,23 +247,6 @@
   </script>
 {{end}}
 
-{{define "dm-composer"}}
-  <span id="composer" role="textbox" contenteditable oninput="realInput.value = this.innerText"
-    {{if .}}
-      {{/*
-        This is a separate template so it can be OOB-swapped to clear the contents of the composer
-        box after a successful DM send.  However, the chat-view itself also loads via HTMX call.
-
-        To prevent the composer from being OOB'd on the initial page load (and thus never rendering),
-        we guard the "hx-swap-oob" attr; so if this template is called with nothing as the arg, then
-        it will be inlined normally (i.e., not OOB'd), and if the arg is something (e.g., a DMTrove),
-        then it will be OOB'd, thus clearing the contents of the composer box.
-      */}}
-      hx-swap-oob="true"
-    {{end}}
-  ></span>
-{{end}}
-
 {{define "conversation-top"}}
   <div class="show-more conversation-top">
     {{if .Cursor.CursorPosition.IsEnd}}