diff --git a/Changelog.md b/Changelog.md
index 3079dcf7c..429d30a4a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@
 * Hide 'reshare' button on already reshared posts [#7169](https://github.com/diaspora/diaspora/pull/7169)
 * Only reload profile header when changing aspect memberships [#7183](https://github.com/diaspora/diaspora/pull/7183)
 * Fix visiblity on invitation modal when opening it from the stream [#7191](https://github.com/diaspora/diaspora/pull/7191)
+* Add avatar fallback on tags page [#7198](https://github.com/diaspora/diaspora/pull/7198)
 
 ## Features
 * Show spinner when loading comments in the stream [#7170](https://github.com/diaspora/diaspora/pull/7170)
diff --git a/app/assets/javascripts/app/views/tags_view.js b/app/assets/javascripts/app/views/tags_view.js
index 3913f8798..9b70df1e6 100644
--- a/app/assets/javascripts/app/views/tags_view.js
+++ b/app/assets/javascripts/app/views/tags_view.js
@@ -5,6 +5,8 @@ app.views.Tags = Backbone.View.extend({
     if(app.publisher) {
       app.publisher.setText("#"+ opts.hashtagName + " ");
     }
+    // add avatar fallback if it can't be loaded
+    $(app.views.Base.prototype.avatars.selector).error(app.views.Base.prototype.avatars.fallback);
   }
 });
 // @license-end