diff --git a/app.py b/app.py
index e39223f..9885a52 100644
--- a/app.py
+++ b/app.py
@@ -1785,7 +1785,7 @@ def following():
         abort(404)
 
     following, older_than, newer_than = paginated_query(DB.activities, q)
-    following = [doc["meta"]["object"] for doc in following]
+    following = [(doc["remote_id"], doc["meta"]["object"]) for doc in following]
     return render_template(
         "following.html",
         following_data=following,
diff --git a/templates/following.html b/templates/following.html
index 0acf561..e5874a8 100644
--- a/templates/following.html
+++ b/templates/following.html
@@ -8,12 +8,12 @@
 {% include "header.html" %}
 
 <div id="following">
-	{% for follow in following_data %}
+	{% for (follow_id, follow) in following_data %}
     {% if session.logged_in %}
 <div style="margin-left:90px;padding-bottom:5px;margin-bottom:15px;">
 <form action="/api/undo" class="action-form"  method="POST">
 <input type="hidden" name="redirect" value="{{ request.path }}"/>
-<input type="hidden" name="id" value="{{ follow.id }}"/>
+<input type="hidden" name="id" value="{{ follow_id }}"/>
 <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
 <button type="submit" class="bar-item">unfollow</button>
 </form>