diff --git a/apps/comment/views/back.py b/apps/comment/views/back.py
index ffd17f6b..1f30e256 100644
--- a/apps/comment/views/back.py
+++ b/apps/comment/views/back.py
@@ -17,7 +17,7 @@ class CommentLstView(generics.ListCreateAPIView):
             "establishment": Establishment.__name__.lower()
         }
 
-        qs = models.Comment.objects.with_base_related()
+        qs = models.Comment.objects.with_base_related().filter(status=models.Comment.WAITING)
 
         if "object" in self.kwargs:
             qs = qs.by_object_id(self.kwargs["object"])
diff --git a/apps/utils/middleware.py b/apps/utils/middleware.py
index 7ab5f532..699b333f 100644
--- a/apps/utils/middleware.py
+++ b/apps/utils/middleware.py
@@ -52,7 +52,10 @@ def parse_cookies(get_response):
 
         # processing country country cookie
         country_code = get_country_code(cookie_dict)
-        request.country_code = country_code
+        if country_code and country_code != 'None':
+            request.country_code = country_code
+        else:
+            request.country_code = None
 
         response = get_response(request)
         return response