diff --git a/bridge/slack/helpers.go b/bridge/slack/helpers.go
index b0af50f5..e4b2e810 100644
--- a/bridge/slack/helpers.go
+++ b/bridge/slack/helpers.go
@@ -189,6 +189,13 @@ func (b *Bslack) populateReceivedMessage(ev *slack.MessageEvent) (*config.Messag
 		}
 	}
 
+	// For edits, only submessage has thread ts.
+	// Ensures edits to threaded messages maintain their prefix hint on the
+	// unthreaded end.
+	if ev.SubMessage != nil {
+		rmsg.ParentID = ev.SubMessage.ThreadTimestamp
+	}
+
 	if err = b.populateMessageWithUserInfo(ev, rmsg); err != nil {
 		return nil, err
 	}