diff --git a/api.py b/api.py
index 4850ad7..e441e89 100644
--- a/api.py
+++ b/api.py
@@ -11,6 +11,7 @@
 from fastapi.responses import Response, StreamingResponse
 from langchain_core.messages import HumanMessage
 from langgraph.types import Command
+from langfuse.callback import CallbackHandler
 
 from zeno.agents.distalert.graph import graph as dist_alert
 from zeno.agents.kba.graph import graph as kba
@@ -20,7 +21,10 @@
 
 
 app = FastAPI()
-# # langfuse_handler = CallbackHandler()
+
+callbacks = []
+if "LANGFUSE_PUBLIC_KEY" in os.environ:
+    callbacks.append(CallbackHandler())
 
 app.add_middleware(
     CORSMiddleware,
@@ -45,7 +49,7 @@ def event_stream_alerts(
         thread_id = str(uuid.uuid4())
 
     config = {
-        # "callbacks": [langfuse_handler],
+        "callbacks": callbacks,
         "configurable": {"thread_id": thread_id},
     }