diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index b8d7a0fb..95af1ae0 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -43,9 +43,10 @@ def tags(request, tag=""):
         active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
 
         for idx, item in enumerate(job_names):
-            members.append(
-                (job_names[idx], active_members[idx], tag + "#" + slug_list[idx])
-            )
+            if active_members[idx]:
+                members.append(
+                    (job_names[idx], active_members[idx], tag + "#" + slug_list[idx])
+                )
 
     context = {
         "posts": posts,
diff --git a/fet2020/templates/members/jobs_list.html b/fet2020/templates/members/jobs_list.html
index cb9f680e..db5acb90 100644
--- a/fet2020/templates/members/jobs_list.html
+++ b/fet2020/templates/members/jobs_list.html
@@ -1,10 +1,18 @@
-<b>Aktuelle Mitglieder:</b>
 
-{% with job_memberships=active_members %}
-    {% include 'members/partials/_job_membership_grid.html' %}
-{% endwith %}
+{% if active_members %}
 
-<b>Vergangene Mitglieder: </b>
-{% with job_memberships=inactive_members %}
-    {% include 'members/partials/_job_membership_grid.html' %}
-{% endwith %}
+    <b>Aktuelle Mitglieder:</b>
+    {% with job_memberships=active_members %}
+        {% include 'members/partials/_job_membership_grid.html' %}
+    {% endwith %}
+
+{% endif %}
+
+{% if inactive_members %}
+
+    <b>Vergangene Mitglieder: </b>
+    {% with job_memberships=inactive_members %}
+        {% include 'members/partials/_job_membership_grid.html' %}
+    {% endwith %}
+
+{% endif %}