diff --git a/app/models/topic.rb b/app/models/topic.rb
index 1f8c6eb573e..5ac125e3034 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -245,7 +245,7 @@ class Topic < ActiveRecord::Base
   end
 
   def best_post
-    posts.order('score desc').limit(1).first
+    posts.order('score desc nulls last').limit(1).first
   end
 
   def has_flags?