diff --git a/app/assets/javascripts/discourse/components/post-gap.js.es6 b/app/assets/javascripts/discourse/components/post-gap.js.es6
index 503448a1d66..4302dc8896c 100644
--- a/app/assets/javascripts/discourse/components/post-gap.js.es6
+++ b/app/assets/javascripts/discourse/components/post-gap.js.es6
@@ -9,8 +9,7 @@
 export default Ember.Component.extend({
   classNameBindings: [':gap', 'gap::hidden'],
 
-  init: function() {
-    this._super();
+  _setup: function() {
     this.set('loading', false);
 
     var before = this.get('before') === 'true',
@@ -19,7 +18,7 @@ export default Ember.Component.extend({
     if (gaps) {
       this.set('gap', gaps[this.get('post.id')]);
     }
-  },
+  }.on('init'),
 
   render: function(buffer) {
     if (this.get('loading')) {
diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js
index 54d9b3e94e4..7ec488c739c 100644
--- a/app/assets/javascripts/discourse/models/post_stream.js
+++ b/app/assets/javascripts/discourse/models/post_stream.js
@@ -662,6 +662,7 @@ Discourse.PostStream = Em.Object.extend({
         posts = this.get('posts');
 
     posts.clear();
+    this.set('gaps', null);
     if (postStreamData) {
       // Load posts if present
       postStreamData.posts.forEach(function(p) {