diff --git a/agents/core-logic/agent.py b/agents/core-logic/agent.py
index a81b9f1..2d28ccb 100644
--- a/agents/core-logic/agent.py
+++ b/agents/core-logic/agent.py
@@ -52,8 +52,6 @@ except ImportError as _e:
         return flash_model if mode != "heavy" else pro_model
     class TokenBudgetExceeded(Exception): pass
 
-create_bq_table_if_not_exists()
-
 _OPAX_MCP_URL = os.environ.get("MCP_SERVER_URL", "https://opax-mcp-zjbqp3prqq-uc.a.run.app")
 _MCP_SECRET   = os.environ.get("MCP_SECRET", "")
 
diff --git a/agents/core-logic/app.py b/agents/core-logic/app.py
index a128b02..949a98a 100644
--- a/agents/core-logic/app.py
+++ b/agents/core-logic/app.py
@@ -22,6 +22,7 @@ try:
     from google.genai.types import Content, Part
     from agent import root_agent
     from agents.recommendations_engine import get_recommendations
+    from token_logger import create_bq_table_if_not_exists
 except ImportError as e:
     logger.error(f"Failed to import ADK dependencies: {e}")
     raise
@@ -41,6 +42,7 @@ _budget_store: dict = {}
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     logger.info(f"OSVauco agent '{APP_NAME}' starting up")
+    create_bq_table_if_not_exists()
     logger.info(f"Static dir: {STATIC_DIR} (exists={STATIC_DIR.exists()})")
     yield
     logger.info(f"OSVauco agent '{APP_NAME}' shutting down")