diff --git a/dbfilter_from_config/__manifest__.py b/dbfilter_from_config/__manifest__.py
index 61f7af8..2a97aae 100644
--- a/dbfilter_from_config/__manifest__.py
+++ b/dbfilter_from_config/__manifest__.py
@@ -27,7 +27,7 @@
     Also required : `proxy_mode` to `True`
 
     Inspired from OCA `dbfilter_from_header`.""",
-    'version': '12.0.0.0.4',
+    'version': '12.0.0.0.5',
     'category': 'Yaltik',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/dbfilter_from_config/override.py b/dbfilter_from_config/override.py
index b48dab3..d262b54 100644
--- a/dbfilter_from_config/override.py
+++ b/dbfilter_from_config/override.py
@@ -38,9 +38,9 @@ http_host_resolv = {}
 
 def db_filter(dbs, httprequest=None):
     """ Override db_filter """
-    http_host = httprequest.environ.get('HTTP_HOST', '').split(':')[0] if httprequest else ''
     if db_filter_str:
         httprequest = httprequest or http.request.httprequest
+        http_host = httprequest.environ.get('HTTP_HOST', '').split(':')[0]
         # If in cache and not empty
         if http_host in http_host_resolv and http_host_resolv.get(http_host):
             dbs = http_host_resolv[http_host]
@@ -52,10 +52,10 @@ def db_filter(dbs, httprequest=None):
                         break
         else:
             dbs = db_filter_odoo(dbs, httprequest)
+        if http_host not in http_host_resolv:
+            http_host_resolv[http_host] = dbs
     else:
         dbs = db_filter_odoo(dbs, httprequest)
-    if http_host not in http_host_resolv:
-        http_host_resolv[http_host] = dbs
     return dbs