diff --git a/app/assets/javascripts/app/models/stream.js b/app/assets/javascripts/app/models/stream.js
index 69311df5e..382dd58c5 100644
--- a/app/assets/javascripts/app/models/stream.js
+++ b/app/assets/javascripts/app/models/stream.js
@@ -59,14 +59,11 @@ app.models.Stream = Backbone.Collection.extend({
   },
 
   preloadOrFetch : function(){ //hai, plz test me THNX
-    app.hasPreload("stream") ? this.preload() : this.fetch()
-    return this.deferred
+    return $.when(app.hasPreload("stream") ? this.preload() : this.fetch())
   },
 
   preload : function(){
     this.items.reset(app.parsePreload("stream"))
     this.trigger("fetched")
-
-    this.deferred = $.when(true)
   }
 });
diff --git a/app/assets/javascripts/app/views/canvas_view.js b/app/assets/javascripts/app/views/canvas_view.js
index 151a34bb5..6a6df3b17 100644
--- a/app/assets/javascripts/app/views/canvas_view.js
+++ b/app/assets/javascripts/app/views/canvas_view.js
@@ -9,25 +9,23 @@ app.views.Canvas = app.views.Base.extend(_.extend({}, app.views.infiniteScrollMi
   },
 
   renderTemplate : function() {
-    this.stream.deferred.done(_.bind(function(){
-      if(this.stream.items.isEmpty()){
-        var message
-          , person = app.page.model
-        if(person.get("is_own_profile")){
-          message = "Make something to start the magic."
-        } else {
-          var name = person.get("name") || ""
-          message = name + " hasn't posted anything yet."
-        }
-
-        this.$el.html("<p class='no-post-message'>" + message + "</p>")
+    if(this.stream.items.isEmpty()){
+      var message
+        , person = app.page.model
+      if(person.get("is_own_profile")){
+        message = "Make something to start the magic."
       } else {
-        this.renderInitialPosts()
+        var name = person.get("name") || ""
+        message = name + " hasn't posted anything yet."
       }
 
-      //needs to be deferred so it happens after html rendering finishes
-      _.defer(_.bind(this.mason, this))
-    }, this))
+      this.$el.html("<p class='no-post-message'>" + message + "</p>")
+    } else {
+      this.renderInitialPosts()
+    }
+
+    //needs to be deferred so it happens after html rendering finishes
+    _.defer(_.bind(this.mason, this))
   },
 
   addPostView : function(post) {