diff --git a/jean-router/app.py b/jean-router/app.py
index 3586e1c..95ab418 100644
--- a/jean-router/app.py
+++ b/jean-router/app.py
@@ -392,6 +392,8 @@ def list_models():
         ctx_len = jean_ctx.get(model_id)
         if ctx_len:
             meta["context_length"] = ctx_len
+            model_info["context_length"] = ctx_len
+            model_info["context_window"] = ctx_len
 
         if meta:
             model_info["meta"] = meta
@@ -424,7 +426,10 @@ def list_models():
             if details.get("family"):
                 meta["family"] = details["family"]
             if details.get("context_length"):
-                meta["context_length"] = details["context_length"]
+                ctx_len = details["context_length"]
+                meta["context_length"] = ctx_len
+                model_info["context_length"] = ctx_len
+                model_info["context_window"] = ctx_len
             if m.get("capabilities"):
                 meta["capabilities"] = m["capabilities"]