diff --git a/src/routes/blogs.rs b/src/routes/blogs.rs
index 474bdd5f0..23a9ab3ab 100644
--- a/src/routes/blogs.rs
+++ b/src/routes/blogs.rs
@@ -369,7 +369,9 @@ pub fn atom_feed(name: String, rockets: PlumeRocket) -> Option<Content<String>>
         Utc.from_utc_datetime(&entries[0].creation_date)
     }
     .to_rfc3339();
-    let uri = uri!(atom_feed: name = name).to_string();
+    let uri = Instance::get_local()
+        .ok()?
+        .compute_box("~", &name, "atom.xml");
     let feed = FeedBuilder::default()
         .title(blog.title)
         .id(&uri)
diff --git a/src/routes/user.rs b/src/routes/user.rs
index 0fcc4251f..c91d5f714 100644
--- a/src/routes/user.rs
+++ b/src/routes/user.rs
@@ -627,7 +627,9 @@ pub fn atom_feed(name: String, rockets: PlumeRocket) -> Option<Content<String>>
         Utc.from_utc_datetime(&entries[0].creation_date)
     }
     .to_rfc3339();
-    let uri = uri!(atom_feed: name = name).to_string();
+    let uri = Instance::get_local()
+        .ok()?
+        .compute_box("@", &name, "atom.xml");
     let feed = FeedBuilder::default()
         .title(author.display_name)
         .id(&uri)