diff --git a/odoo/addons/test_http/tests/test_common.py b/odoo/addons/test_http/tests/test_common.py
index a8c72ae272f..e2a4eabf262 100644
--- a/odoo/addons/test_http/tests/test_common.py
+++ b/odoo/addons/test_http/tests/test_common.py
@@ -16,11 +16,12 @@ class TestHttpBase(HttpCase):
         geoip_resolver = MemoryGeoipResolver()
         session_store = MemorySessionStore(session_class=Session)
 
+        lazy_property.reset_all(odoo.http.root)
         cls.addClassCleanup(lazy_property.reset_all, odoo.http.root)
         cls.classPatch(odoo.conf, 'server_wide_modules', ['base', 'web', 'test_http'])
-        cls.classPatch(odoo.http.root, 'session_store', session_store)
-        cls.classPatch(odoo.http.root, 'geoip_city_db', geoip_resolver)
-        cls.classPatch(odoo.http.root, 'geoip_country_db', geoip_resolver)
+        cls.classPatch(odoo.http.Application, 'session_store', session_store)
+        cls.classPatch(odoo.http.Application, 'geoip_city_db', geoip_resolver)
+        cls.classPatch(odoo.http.Application, 'geoip_country_db', geoip_resolver)
 
     def setUp(self):
         super().setUp()
diff --git a/odoo/http.py b/odoo/http.py
index 662496813db..7f8b92e250f 100644
--- a/odoo/http.py
+++ b/odoo/http.py
@@ -1045,6 +1045,8 @@ class GeoIP(collections.abc.Mapping):
     def _city_record(self):
         try:
             return root.geoip_city_db.city(self.ip)
+        except (OSError, maxminddb.InvalidDatabaseError):
+            return GEOIP_EMPTY_CITY
         except geoip2.errors.AddressNotFoundError:
             return GEOIP_EMPTY_CITY
 
@@ -1056,6 +1058,8 @@ class GeoIP(collections.abc.Mapping):
             return self._city_record
         try:
             return root.geoip_country_db.country(self.ip)
+        except (OSError, maxminddb.InvalidDatabaseError):
+            return self._city_record
         except geoip2.errors.AddressNotFoundError:
             return GEOIP_EMPTY_COUNTRY
 
@@ -2020,10 +2024,7 @@ class Application:
                 "Couldn't load Geoip City file at %s. IP Resolver disabled.",
                 config['geoip_city_db'], exc_info=True
             )
-            return type('FakeReader', (), {
-                'city': lambda self, ip: GEOIP_EMPTY_CITY,
-                'country': lambda self, ip: GEOIP_EMPTY_COUNTRY
-            })()
+            raise
 
     @lazy_property
     def geoip_country_db(self):
@@ -2031,7 +2032,7 @@ class Application:
             return geoip2.database.Reader(config['geoip_country_db'])
         except (OSError, maxminddb.InvalidDatabaseError) as exc:
             _logger.debug("Couldn't load Geoip Country file (%s). Fallbacks on Geoip City.", exc,)
-            return self.geoip_city_db
+            raise
 
     def set_csp(self, response):
         headers = response.headers