diff --git a/netbox/templates/inc/filter_list.html b/netbox/templates/inc/filter_list.html
index 4276764d1..c52739a88 100644
--- a/netbox/templates/inc/filter_list.html
+++ b/netbox/templates/inc/filter_list.html
@@ -1,7 +1,21 @@
 {% load form_helpers %}
 {% load helpers %}
 
-<form action="." method="get">
+<script>
+function cleangeturl(form) {
+  
+  var form_elements = form.elements;
+  
+  for (var i=0; i<form_elements.length; i++ ) {
+    var element = form_elements[i]
+    if (element.name && element.value == '') {
+      element.disabled=true;
+    }
+  }
+
+</script>
+
+<form action="." method="get" onsubmit="return cleangeturl(this)">
   <div class="card">
     <div class="card-body overflow-visible d-flex flex-wrap justify-content-between py-3">
       {% for field in filter_form.hidden_fields %}