diff --git a/Changelog.md b/Changelog.md
index 9e327dfe0..4a22adf2c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -70,6 +70,15 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Bigger mobile publisher [#6261](https://github.com/diaspora/diaspora/pull/6261)
 * Backend information panel & health checks for known pods [#6290](https://github.com/diaspora/diaspora/pull/6290)
 
+# 0.5.4.0
+
+## Refactor
+
+## Bug fixes
+
+## Features
+* Show spinner on initial stream load [#6384](https://github.com/diaspora/diaspora/pull/6384)
+
 # 0.5.3.0
 
 ## Refactor
diff --git a/app/assets/javascripts/app/views/infinite_stream_view.js b/app/assets/javascripts/app/views/infinite_stream_view.js
index 29e590f3a..7696d0b15 100644
--- a/app/assets/javascripts/app/views/infinite_stream_view.js
+++ b/app/assets/javascripts/app/views/infinite_stream_view.js
@@ -13,6 +13,7 @@ app.views.InfScroll = app.views.Base.extend({
     this.postViews = this.postViews || [];
     this._resetPostFragments();
 
+    this.showLoader();
     this.bind("loadMore", this.fetchAndshowLoader, this);
     this.stream.bind("fetched", this.finishedLoading, this);
     this.stream.bind("allItemsLoaded", this.unbindInfScroll, this);