diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 6ed996b3368..3530a2929fb 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -13,15 +13,10 @@ const Topic = RestModel.extend({
     return poster && poster.user;
   },
 
-  @computed('posters.lastObject')
-  lastPoster(poster) {
-    if (poster){
-      if (this.last_poster_username === poster.user.username){
-        return poster.user;
-      } else {
-        return this.get('creator');
-      }
-    }
+  @computed('posters.@each')
+  lastPoster(posters) {
+    const latest = posters.filter(p => p.extras && p.extras.indexOf("latest") >= 0)[0];
+    return latest.user;
   },
 
   @computed('fancy_title')