diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 5ffdc998..ed01f8eb 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -649,10 +649,12 @@ type StarBtnFragmentParams struct {
 	IsStarred bool
 	SubjectAt syntax.ATURI
 	StarCount int
+	HxSwapOob bool
 }
 
 func (p *Pages) StarBtnFragment(w io.Writer, params StarBtnFragmentParams) error {
-	return p.executePlain("fragments/starBtn-oob", w, params)
+	params.HxSwapOob = true
+	return p.executePlain("fragments/starBtn", w, params)
 }
 
 type RepoIndexParams struct {
diff --git a/appview/pages/templates/fragments/starBtn-oob.html b/appview/pages/templates/fragments/starBtn-oob.html
deleted file mode 100644
index 34350b02..00000000
--- a/appview/pages/templates/fragments/starBtn-oob.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ 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 a05088e2..08982701 100644
--- a/appview/pages/templates/fragments/starBtn.html
+++ b/appview/pages/templates/fragments/starBtn.html
@@ -9,6 +9,7 @@
         {{ else }}
             hx-post="/star?subject={{ .SubjectAt }}&countHint={{ .StarCount }}"
         {{ end }}
+        {{ if .HxSwapOob }}hx-swap-oob='outerHTML:#starBtn[data-star-subject-at="{{ .SubjectAt }}"]'{{ end }}
 
         hx-trigger="click"
         hx-disabled-elt="#starBtn"