diff --git a/catalog/templates/_item_comments.html b/catalog/templates/_item_comments.html
index 60a0f198..1aaba751 100644
--- a/catalog/templates/_item_comments.html
+++ b/catalog/templates/_item_comments.html
@@ -4,10 +4,11 @@
 {% load mastodon %}
 {% load duration %}
 {% load user_actions %}
+{% load comment_item %}
 {% if item.class_name == "tvseason" and not request.GET.last %}
   {% if item.all_episodes %}
     <div class="season-picker">
-      <span class="season-number"><a class="current">{% trans "all" %}</a></span>
+      <span class="season-number"><a class="current">{% trans "season" %}</a></span>
       {% for ep in item.all_episodes %}
         <span class="season-number" id="ci_{{ ep.uuid }}">
           <a hx-swap="innerHTML"
diff --git a/catalog/templates/_item_comments_by_episode.html b/catalog/templates/_item_comments_by_episode.html
index 4133af57..29f6ec70 100644
--- a/catalog/templates/_item_comments_by_episode.html
+++ b/catalog/templates/_item_comments_by_episode.html
@@ -10,7 +10,7 @@
       <span class="season-number">
         <a hx-swap="innerHTML"
            hx-get="{% url "catalog:comments" item.url_path item.uuid %}"
-           hx-target="#comments">{% trans "all" %}</a>
+           hx-target="#comments">{% trans "season" %}</a>
       </span>
       {% for ep in item.all_episodes %}
         <span class="season-number" id="ci_{{ ep.uuid }}">
diff --git a/catalog/views.py b/catalog/views.py
index 54bb61d7..6b21a24e 100644
--- a/catalog/views.py
+++ b/catalog/views.py
@@ -189,7 +189,10 @@ def review_list(request, item_path, item_uuid):
 
 def comments(request, item_path, item_uuid):
     item = get_object_or_404(Item, uid=get_uuid_or_404(item_uuid))
-    ids = item.child_item_ids + [item.pk] + item.sibling_item_ids
+    if item.class_name == "tvseason":
+        ids = [item.pk]
+    else:
+        ids = item.child_item_ids + [item.pk] + item.sibling_item_ids
     queryset = Comment.objects.filter(item_id__in=ids).order_by("-created_time")
     queryset = queryset.filter(q_piece_visible_to_user(request.user))
     before_time = request.GET.get("last")