diff --git a/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift b/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift
index ca7660c7..0f4af945 100644
--- a/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift
+++ b/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift
@@ -43,6 +43,11 @@ public class StatusRowViewModel: ObservableObject {
   var filter: Filtered? {
     status.reblog?.filtered?.first ?? status.filtered?.first
   }
+  
+  var isThread: Bool {
+    status.reblog?.inReplyToId != nil || status.reblog?.inReplyToAccountId != nil ||
+    status.inReplyToId != nil || status.inReplyToAccountId != nil 
+  }
 
   var highlightRowColor: Color {
     if status.visibility == .direct {
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift
index 9161ed49..c68330f1 100644
--- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift
+++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift
@@ -72,7 +72,7 @@ struct StatusRowHeaderView: View {
 
   @ViewBuilder
   private var threadIcon: some View {
-    if viewModel.status.reblog?.inReplyToAccountId != nil || viewModel.status.inReplyToAccountId != nil {
+    if viewModel.isThread {
       Image(systemName: "bubble.left.and.bubble.right")
         .resizable()
         .aspectRatio(contentMode: .fit)