diff --git a/halfapi/half_domain.py b/halfapi/half_domain.py
index 223f00d..f417d02 100644
--- a/halfapi/half_domain.py
+++ b/halfapi/half_domain.py
@@ -14,7 +14,6 @@ from starlette.applications import Starlette
 from starlette.middleware import Middleware
 from starlette.routing import Router, Route
 from starlette.schemas import SchemaGenerator
-from .lib.responses import ORJSONResponse
 
 from .lib.acl import AclRoute
 
@@ -84,15 +83,16 @@ class HalfDomain(Starlette):
         super().__init__(
             routes=self.gen_domain_routes(),
             middleware=[
-                (DomainMiddleware, {
-                    'domain': {
+                Middleware(
+                    DomainMiddleware,
+                    domain={
                         'name': self.name,
                         'id': self.id,
                         'version': self.version,
                         'halfapi_version': self.halfapi_version,
                         'config': self.config.get('domain', {}).get(self.name, {}).get('config', {})
                     }
-                })
+                )
             ]
         )
 
diff --git a/halfapi/lib/domain_middleware.py b/halfapi/lib/domain_middleware.py
index f152dd6..cc3dd2f 100644
--- a/halfapi/lib/domain_middleware.py
+++ b/halfapi/lib/domain_middleware.py
@@ -17,7 +17,7 @@ class DomainMiddleware(BaseHTTPMiddleware):
         - acl
     """
 
-    def __init__(self, app, domain):
+    def __init__(self, app, domain=None):
         """ app: HalfAPI instance
         """
         logger.info('DomainMiddleware app:%s domain:%s', app, domain)