diff --git a/apps/comment/models.py b/apps/comment/models.py
index ca6d39ec..470c46d9 100644
--- a/apps/comment/models.py
+++ b/apps/comment/models.py
@@ -18,11 +18,11 @@ class CommentQuerySet(models.QuerySet):
         """Annotate belonging status"""
         return self.annotate(is_mine=models.Case(
             models.When(
-                models.Q(user=user),
+                models.Q(user=user if user.is_authenticated else None),
                 then=True
             ),
             default=False,
-            output_field=models.BooleanField(default=False)
+            output_field=models.BooleanField()
         ))
 
 
diff --git a/apps/establishment/serializers.py b/apps/establishment/serializers.py
index 49209487..78a30131 100644
--- a/apps/establishment/serializers.py
+++ b/apps/establishment/serializers.py
@@ -185,14 +185,9 @@ class EstablishmentSerializer(serializers.ModelSerializer):
     def get_comments(self, obj):
         """Serializer method for comment field"""
         request = self.context.get('request')
-        if request.user.is_authenticated:
-            return CommentSerializer(obj.comments.annotate_is_mine_status(user=request.user),
-                                     context={'request': self.context.get('request')},
-                                     many=True).data
-        else:
-            return CommentSerializer(obj.comments,
-                                     context={'request': self.context.get('request')},
-                                     many=True).data
+        return CommentSerializer(obj.comments.annotate_is_mine_status(user=request.user),
+                                 context={'request': self.context.get('request')},
+                                 many=True).data
 
     def get_preview_image(self, obj):
         """Get preview image"""