diff --git a/asab/web/auth/service.py b/asab/web/auth/service.py
index bba20a81..bb0dc59b 100644
--- a/asab/web/auth/service.py
+++ b/asab/web/auth/service.py
@@ -444,10 +444,6 @@ async def _wrap_handlers(self, aiohttp_app):
 			if not inspect.iscoroutinefunction(route.handler):
 				continue
 
-			# Skip auth for HEAD requests
-			if route.method == "HEAD":
-				continue
-
 			try:
 				self._wrap_handler(route)
 			except Exception as e:
@@ -762,7 +758,7 @@ def _set_tenant_context_from_url_query(handler):
 	@functools.wraps(handler)
 	async def wrapper(*args, **kwargs):
 		request = args[-1]
-		header_tenant = Tenant.get(None)
+		header_tenant = request.headers.get("X-Tenant")
 		tenant = request.query.get("tenant")
 
 		if tenant is None:
@@ -797,7 +793,7 @@ def _set_tenant_context_from_url_path(handler):
 	@functools.wraps(handler)
 	async def wrapper(*args, **kwargs):
 		request = args[-1]
-		header_tenant = Tenant.get(None)
+		header_tenant = request.headers.get("X-Tenant")
 		tenant = request.match_info.get("tenant")
 
 		if header_tenant is not None: