diff --git a/app/modules/clients/templates/clients/list.html b/app/modules/clients/templates/clients/list.html
index 04d5fdd..b868070 100644
--- a/app/modules/clients/templates/clients/list.html
+++ b/app/modules/clients/templates/clients/list.html
@@ -10,7 +10,7 @@
     <div class="flex flex-wrap gap-3">
       <a href="/client-groups" class="inline-flex rounded-xl border border-slate-300 px-4 py-2 text-sm font-medium text-slate-700 hover:bg-slate-50">Client Groups</a>
       {% if can_export %}
-      <a href="/clients/export?q={{ q|urlencode }}&status={{ status|urlencode }}&client_type={{ client_type|urlencode }}&partner_id={{ partner_id or '' }}&include_archived={{ include_archived }}&sort_by={{ sort_by|urlencode }}&sort_order={{ sort_order|urlencode }}"
+      <a href="/clients/export?q={{ q|urlencode }}&status={{ status|urlencode }}&client_type={{ client_type|urlencode }}{% if partner_id %}&partner_id={{ partner_id }}{% endif %}&include_archived={{ include_archived }}&sort_by={{ sort_by|urlencode }}&sort_order={{ sort_order|urlencode }}"
          class="inline-flex rounded-xl border border-slate-300 px-4 py-2 text-sm font-medium text-slate-700 hover:bg-slate-50">
         Export CSV
       </a>
@@ -51,8 +51,12 @@
         <input type="hidden" name="q" value="{{ q }}">
         <input type="hidden" name="status" value="{{ status }}">
         <input type="hidden" name="client_type" value="{{ client_type }}">
-        <input type="hidden" name="client_group_id" value="{{ client_group_id or '' }}">
-        <input type="hidden" name="partner_id" value="{{ partner_id or '' }}">
+        {% if client_group_id %}
+        <input type="hidden" name="client_group_id" value="{{ client_group_id }}">
+        {% endif %}
+        {% if partner_id %}
+        <input type="hidden" name="partner_id" value="{{ partner_id }}">
+        {% endif %}
         <input type="hidden" name="include_archived" value="{{ 'true' if include_archived else 'false' }}">
         <input type="hidden" name="sort_by" value="{{ sort_by }}">
         <input type="hidden" name="sort_order" value="{{ sort_order }}">
@@ -68,7 +72,14 @@
 
       {% if meta.pages > 1 %}
       <nav class="flex items-center gap-1" aria-label="Client list pagination">
-        {% set common_query = 'q=' ~ (q|urlencode) ~ '&status=' ~ (status|urlencode) ~ '&client_type=' ~ (client_type|urlencode) ~ '&client_group_id=' ~ (client_group_id or '') ~ '&partner_id=' ~ (partner_id or '') ~ '&include_archived=' ~ ('true' if include_archived else 'false') ~ '&per_page=' ~ meta.per_page ~ '&sort_by=' ~ (sort_by|urlencode) ~ '&sort_order=' ~ (sort_order|urlencode) %}
+        {% set query = namespace(value='q=' ~ (q|urlencode) ~ '&status=' ~ (status|urlencode) ~ '&client_type=' ~ (client_type|urlencode) ~ '&include_archived=' ~ ('true' if include_archived else 'false') ~ '&per_page=' ~ meta.per_page ~ '&sort_by=' ~ (sort_by|urlencode) ~ '&sort_order=' ~ (sort_order|urlencode)) %}
+        {% if client_group_id %}
+          {% set query.value = query.value ~ '&client_group_id=' ~ client_group_id %}
+        {% endif %}
+        {% if partner_id %}
+          {% set query.value = query.value ~ '&partner_id=' ~ partner_id %}
+        {% endif %}
+        {% set common_query = query.value %}
 
         {% if meta.page > 1 %}
         <a href="/clients?{{ common_query }}&page={{ meta.page - 1 }}"