diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 6394a9e2..7e806392 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -640,7 +640,7 @@ type StarBtnFragmentParams struct {
 }
 
 func (p *Pages) StarBtnFragment(w io.Writer, params StarBtnFragmentParams) error {
-	return p.executePlain("fragments/starBtn", w, params)
+	return p.executePlain("fragments/starBtn-oob", w, params)
 }
 
 type RepoIndexParams struct {
diff --git a/appview/pages/templates/fragments/starBtn-oob.html b/appview/pages/templates/fragments/starBtn-oob.html
new file mode 100644
index 00000000..34350b02
--- /dev/null
+++ b/appview/pages/templates/fragments/starBtn-oob.html
@@ -0,0 +1,5 @@
+{{ define "fragments/starBtn-oob" }}
+  <div hx-swap-oob='outerHTML:#starBtn[data-star-subject-at="{{ .SubjectAt }}"]'>
+    {{ template "fragments/starBtn" . }}
+  </div>
+{{ end }}
diff --git a/appview/pages/templates/fragments/starBtn.html b/appview/pages/templates/fragments/starBtn.html
index 3eca8942..a05088e2 100644
--- a/appview/pages/templates/fragments/starBtn.html
+++ b/appview/pages/templates/fragments/starBtn.html
@@ -1,4 +1,5 @@
 {{ define "fragments/starBtn" }}
+    {{/* NOTE: this fragment is always replaced with hx-swap-oob */}}
     <button
         id="starBtn"
         class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group"
@@ -10,9 +11,6 @@
         {{ end }}
 
         hx-trigger="click"
-        hx-target="this"
-        hx-swap="outerHTML"
-        hx-swap-oob='outerHTML:#starBtn[data-star-subject-at="{{ .SubjectAt }}"]'
         hx-disabled-elt="#starBtn"
     >
         {{ if .IsStarred }}