diff --git a/app/models/forem/topic.rb b/app/models/forem/topic.rb
index 1336d732f..72ecda402 100644
--- a/app/models/forem/topic.rb
+++ b/app/models/forem/topic.rb
@@ -52,8 +52,9 @@ def by_most_recent_post
       end
 
       def by_pinned_or_most_recent_post
-        order('forem_topics.last_post_at DESC').order('forem_topics.pinned DESC')
-        #order('forem_topics.id')
+	order('forem_topics.pinned DESC').
+        order('forem_topics.last_post_at DESC').
+        order('forem_topics.id')
       end
 
       def pending_review