diff --git a/fun.go b/fun.go
index f4a6cb4..8be5d56 100644
--- a/fun.go
+++ b/fun.go
@@ -38,9 +38,6 @@ func reverbolate(honks []*Honk) {
 			} else {
 				h.URL = h.XID
 			}
-			if h.RID != "" && strings.IndexByte(h.RID, '/') == -1 {
-				h.RID = h.Honker + "/h/" + h.RID
-			}
 			h.Noise = mentionize(h.Noise)
 		} else {
 			idx := strings.LastIndexByte(h.Honker, '/')
diff --git a/honk.go b/honk.go
index 76bc434..e6425cc 100644
--- a/honk.go
+++ b/honk.go
@@ -813,7 +813,6 @@ func savehonk(w http.ResponseWriter, r *http.Request) {
 		Username: userinfo.Username,
 		What:     "honk",
 		XID:      xid,
-		RID:      rid,
 		Date:     dt,
 	}
 	if noise[0] == '@' {
@@ -825,6 +824,9 @@ func savehonk(w http.ResponseWriter, r *http.Request) {
 	if rid != "" {
 		xonk := getxonk("", rid)
 		if xonk != nil {
+			if xonk.Honker == "" {
+				rid = "https://" + serverName + "/u/" + xonk.Username + "/h/" + rid
+			}
 			honk.Audience = append(honk.Audience, xonk.Audience...)
 			convoy = xonk.Convoy
 		} else {
@@ -832,6 +834,7 @@ func savehonk(w http.ResponseWriter, r *http.Request) {
 			honk.Audience = append(honk.Audience, xonkaud...)
 			convoy = c
 		}
+		honk.RID = rid
 	}
 	if convoy == "" {
 		convoy = "data:,electrichonkytonk-" + xfiltrate()