diff --git a/helpdesk/templates/helpdesk/filters/status.html b/helpdesk/templates/helpdesk/filters/status.html
index 26cfd2c8..8c2ce03f 100644
--- a/helpdesk/templates/helpdesk/filters/status.html
+++ b/helpdesk/templates/helpdesk/filters/status.html
@@ -6,14 +6,7 @@
             <label for='id_statuses'>{% trans "Status(es)" %}:</label>
     </div>
     <div class="col col-sm-3">
-            <select id='id_statuses' name='status' multiple='selected' size='5'>
-            {% with magic_number=-1 %}
-            <option value='{{magic_number}}'{% if query_params.filtering_null.status__isnull %} selected='selected'{% endif %}>
-                {% trans "Unassigned" %}
-            </option>
-            {% endwith %}
-
-            {% for s in status_choices %}<option value='{{ s.0 }}'{% if s.0|in_list:query_params.filtering.status__in %} selected='selected'{% endif %}>{{ s.1 }}</option>{% endfor %}</select>
+            <select id='id_statuses' name='status' multiple='selected' size='5'>{% for s in status_choices %}<option value='{{ s.0 }}'{% if s.0|in_list:query_params.filtering.status__in %} selected='selected'{% endif %}>{{ s.1 }}</option>{% endfor %}</select>
     </div>
   <div class="col col-sm-6">
     <button class="filterBuilderRemove btn btn-danger btn-sm float-right"><i class="fas fa-trash-alt"></i></button>
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index 58ce7e21..2e644c7f 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -176,7 +176,7 @@
                                         <option id="filterBuilderSelect-Queue" value="Queue"{% if query_params.filtering.queue__id__in or query_params.filtering_null.queue__id__isnull %} disabled{% endif %}>
                                             {% trans "Queue" %}
                                         </option>
-                                        <option id="filterBuilderSelect-Status" value="Status"{% if query_params.filtering.status__in or query_params.filtering_null.status__isnull %} disabled{% endif %}>
+                                        <option id="filterBuilderSelect-Status" value="Status"{% if query_params.filtering.status__in %} disabled{% endif %}>
                                             {% trans "Status" %}
                                         </option>
                                         <option id="filterBuilderSelect-Keywords" value="Keywords"{% if query_params.search_string %} disabled{% endif %}>
@@ -208,7 +208,7 @@
                                     id="filterBoxQueue">
                                     {% include 'helpdesk/filters/queue.html' %}
                                 </li>
-                                <li class="list-group-item filterBox{% if query_params.filtering.status__in or query_params.filtering_null.status__isnull %} filterBoxShow{% endif %}"
+                                <li class="list-group-item filterBox{% if query_params.filtering.status__in %} filterBoxShow{% endif %}"
                                     id="filterBoxStatus">
                                     {% include 'helpdesk/filters/status.html' %}
                                 </li>