diff --git a/app/models/reshare.rb b/app/models/reshare.rb
index 82f1c4eb3..8de96bcf3 100644
--- a/app/models/reshare.rb
+++ b/app/models/reshare.rb
@@ -42,7 +42,7 @@ class Reshare < Post
   end
 
   def photos
-    self.root ? root.photos : super
+    self.root ? root.photos : nil
   end
 
   def receive(recipient, sender)
diff --git a/public/javascripts/app/models/stream.js b/public/javascripts/app/models/stream.js
index 77a93bdb9..0e70eb26b 100644
--- a/public/javascripts/app/models/stream.js
+++ b/public/javascripts/app/models/stream.js
@@ -47,8 +47,11 @@ app.models.Stream = Backbone.Collection.extend({
 
   maxTime: function(){
     var lastPost = _.last(this.posts.models);
-    var isOnParticipateStream = this.basePath().match(/participate/);
-    return (isOnParticipateStream == null) ? lastPost.createdAt() : lastPost.interactedAt();
+    return lastPost[this.sortOrder()]()
+  },
+
+  sortOrder : function() {
+    return this.basePath().match(/participate/) ? "interactedAt" : "createdAt"
   },
 
   add : function(models){