diff --git a/pyproject.toml b/pyproject.toml
index 68c2594..4d1c7b1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "jinjax"
-version = "0.21"
+version = "0.22"
 description = "Replace your HTML templates with Python server-Side components"
 authors = ["Juan-Pablo Scaletti <juanpablo@jpscaletti.com>"]
 license = "MIT"
diff --git a/src/jinjax/catalog.py b/src/jinjax/catalog.py
index 69c5292..398eaeb 100644
--- a/src/jinjax/catalog.py
+++ b/src/jinjax/catalog.py
@@ -3,6 +3,7 @@
 from pathlib import Path
 
 import jinja2
+from jinja2.environment import load_extensions
 from markupsafe import Markup
 
 from .component import Component
@@ -45,6 +46,7 @@ def __init__(
         filters: "t.Optional[dict[str,t.Any]]" = None,
         tests: "t.Optional[dict[str,t.Any]]" = None,
         extensions: "t.Optional[list]" = None,
+        jinja_env: "t.Optional[jinja2.Environment]" = None,
         root_url: str = DEFAULT_URL_ROOT,
         file_ext: "TFileExt" = DEFAULT_EXTENSION,
     ) -> None:
@@ -57,16 +59,21 @@ def __init__(
         root_url = root_url.strip().rstrip(SLASH)
         self.root_url = f"{root_url}{SLASH}"
 
-        extensions = (extensions or []) + ["jinja2.ext.do", JinjaX]
-        jinja_env = jinja2.Environment(
-            extensions=extensions,
+        jinja_env = jinja_env or jinja2.Environment(
             undefined=jinja2.StrictUndefined,
         )
+
+        extensions = (extensions or []) + ["jinja2.ext.do", JinjaX]
+        jinja_env.extensions.update(load_extensions(jinja_env, extensions))
+
         globals = globals or {}
         globals["catalog"] = self
         jinja_env.globals.update(globals)
+
         jinja_env.filters.update(filters or {})
+
         jinja_env.tests.update(tests or {})
+
         jinja_env.extend(catalog=self)
         self.jinja_env = jinja_env