diff --git a/app/services/server_service.py b/app/services/server_service.py
index 0f71317..6c0464d 100644
--- a/app/services/server_service.py
+++ b/app/services/server_service.py
@@ -111,11 +111,17 @@ def list_servers(db, filters, page=1, per_page=50, sort="hostname", sort_dir="as
     if filters.get("domain"):
         where.append("d.code = :domain"); params["domain"] = filters["domain"]
     if filters.get("env"):
-        where.append("s.environnement = :env"); params["env"] = filters["env"]
+        if filters["env"] == "__null__":
+            where.append("s.environnement IS NULL OR s.environnement = ''")
+        else:
+            where.append("s.environnement = :env"); params["env"] = filters["env"]
     if filters.get("tier"):
         where.append("s.tier = :tier"); params["tier"] = filters["tier"]
     if filters.get("etat"):
-        where.append("s.etat = :etat"); params["etat"] = filters["etat"]
+        if filters["etat"] == "__null__":
+            where.append("s.etat IS NULL")
+        else:
+            where.append("s.etat = :etat"); params["etat"] = filters["etat"]
     if filters.get("os"):
         where.append("s.os_family = :os"); params["os"] = filters["os"]
     if filters.get("owner"):
diff --git a/app/templates/servers.html b/app/templates/servers.html
index fa3e344..1b2749c 100644
--- a/app/templates/servers.html
+++ b/app/templates/servers.html
@@ -31,12 +31,14 @@
     </select>
     <select name="env" onchange="this.form.submit()"><option value="">Env</option>
         {% for e in ['Développement','Intégration','Pré-Prod','Production','Recette','Test','Formation'] %}<option value="{{ e }}" {% if filters.env == e %}selected{% endif %}>{{ e }}</option>{% endfor %}
+        <option value="__null__" {% if filters.env == '__null__' %}selected{% endif %}>(Sans env)</option>
     </select>
     <select name="tier" onchange="this.form.submit()"><option value="">Tier</option>
         {% for t in ['tier0','tier1','tier2','tier3'] %}<option value="{{ t }}" {% if filters.tier == t %}selected{% endif %}>{{ t }}</option>{% endfor %}
     </select>
     <select name="etat" onchange="this.form.submit()"><option value="">Etat</option>
         {% for e in ['Production','Implémentation','Stock','Obsolète','prêt','tests'] %}<option value="{{ e }}" {% if filters.etat == e %}selected{% endif %}>{{ e }}</option>{% endfor %}
+        <option value="__null__" {% if filters.etat == '__null__' %}selected{% endif %}>(Sans état)</option>
     </select>
     <select name="os" onchange="this.form.submit()"><option value="">OS</option>
         <option value="linux" {% if filters.os == 'linux' %}selected{% endif %}>Linux</option>