diff --git a/letta/server/rest_api/app.py b/letta/server/rest_api/app.py
index 91d8905f..e984a37e 100644
--- a/letta/server/rest_api/app.py
+++ b/letta/server/rest_api/app.py
@@ -33,6 +33,7 @@ from letta.errors import (
     AgentNotFoundForExportError,
     BedrockPermissionError,
     ConcurrentUpdateError,
+    ContextWindowExceededError,
     ConversationBusyError,
     EmbeddingConfigRequiredError,
     HandleNotFoundError,
@@ -513,6 +514,7 @@ def create_application() -> "FastAPI":
     app.add_exception_handler(AgentFileImportError, _error_handler_400)
     app.add_exception_handler(EmbeddingConfigRequiredError, _error_handler_400)
     app.add_exception_handler(LettaImageFetchError, _error_handler_400)
+    app.add_exception_handler(ContextWindowExceededError, _error_handler_400)
     app.add_exception_handler(ValueError, _error_handler_400)
 
     # 404 Not Found errors