diff --git a/app/models/topic_view_item.rb b/app/models/topic_view_item.rb
index 215ad9f72e5..73bdc636c67 100644
--- a/app/models/topic_view_item.rb
+++ b/app/models/topic_view_item.rb
@@ -33,7 +33,7 @@ class TopicViewItem < ActiveRecord::Base
         builder = SqlBuilder.new(sql)
 
         if !user_id
-          builder.where("ip_address = :ip_address AND topic_id = :topic_id")
+          builder.where("ip_address = :ip_address AND topic_id = :topic_id AND user_id IS NULL")
         else
           builder.where("user_id = :user_id AND topic_id = :topic_id")
         end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 41d296670b3..c2d98f077b1 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -124,6 +124,7 @@ class TopicViewSerializer < ApplicationSerializer
   def include_is_warning?
     is_warning
   end
+
   def draft
     object.draft
   end