diff --git a/crates/adapters/postgres/src/feed.rs b/crates/adapters/postgres/src/feed.rs
index e94441b..393f313 100644
--- a/crates/adapters/postgres/src/feed.rs
+++ b/crates/adapters/postgres/src/feed.rs
@@ -97,7 +97,11 @@ fn feed_select(viewer: Option<uuid::Uuid>) -> String {
         t.created_at AS thought_created_at, t.updated_at,
         u.id AS author_id,
         CASE WHEN NOT u.local AND ra.handle IS NOT NULL AND ra.handle != ''
-             THEN '@' || ra.handle ELSE u.username END AS username,
+             THEN '@' || ra.handle ||
+                  CASE WHEN ra.handle NOT LIKE '%@%'
+                       THEN '@' || SPLIT_PART(ra.url, '/', 3)
+                       ELSE '' END
+             ELSE u.username END AS username,
         u.email, u.password_hash,
         COALESCE(ra.display_name, u.display_name) AS display_name,
         u.bio,