diff --git a/app/admin/api.py b/app/admin/api.py
index a87d2fc..01b2dc8 100644
--- a/app/admin/api.py
+++ b/app/admin/api.py
@@ -1,3 +1,7 @@
+import json
+
+from cdp import Wallet
+from cdp.cdp import Cdp
 from fastapi import APIRouter, Body, Depends, HTTPException
 from pydantic import BaseModel, Field
 from sqlalchemy.exc import SQLAlchemyError
@@ -48,11 +52,26 @@ async def create_agent(
         agent.owner = subject
 
     # Get the latest agent from create_or_update
-    latest_agent = await agent.create_or_update()
-
-    message = "Agent created"
-    if latest_agent.created_at != latest_agent.updated_at:
-        message = "Agent updated"
+    latest_agent, is_new = await agent.create_or_update()
+
+    if is_new:
+        message = "Agent Created"
+        # create the wallet
+        Cdp.configure(
+            api_key_name=config.cdp_api_key_name,
+            private_key=config.cdp_api_key_private_key,
+        )
+        wallet = Wallet.create(network_id=latest_agent.cdp_network_id)
+        wallet_data = wallet.export_data().to_dict()
+        wallet_data["default_address_id"] = wallet.default_address.address_id
+        agent_data = AgentData(
+            id=latest_agent.id, cdp_wallet_data=json.dumps(wallet_data)
+        )
+        await agent_data.save()
+    else:
+        message = "Agent Updated"
+        agent_data = await AgentData.get(latest_agent.id)
+        wallet_data = json.loads(agent_data.cdp_wallet_data) if agent_data else {}
     # Send Slack notification
     send_slack_message(
         message,
@@ -104,20 +123,20 @@ async def create_agent(
                         "title": "Twitter Skills",
                         "value": str(latest_agent.twitter_skills),
                     },
+                    {
+                        "title": "CDP Wallet Address",
+                        "value": wallet_data.get("default_address_id"),
+                    },
                 ],
             }
         ],
     )
 
     # Mask sensitive data in response
-    latest_agent.cdp_wallet_data = "forbidden"
     if latest_agent.skill_sets is not None:
         for key in latest_agent.skill_sets:
             latest_agent.skill_sets[key] = {}
 
-    # Get agent data
-    agent_data = await AgentData.get(latest_agent.id)
-
     # Convert to AgentResponse
     return AgentResponse.from_agent(latest_agent, agent_data)
 
diff --git a/app/core/engine.py b/app/core/engine.py
index 3864e72..22001e1 100644
--- a/app/core/engine.py
+++ b/app/core/engine.py
@@ -170,9 +170,6 @@ async def initialize_agent(aid):
         }
         if agent_data and agent_data.cdp_wallet_data:
             values["cdp_wallet_data"] = agent_data.cdp_wallet_data
-        elif agent.cdp_wallet_data:
-            # If there is a persisted agentic wallet, load it and pass to the CDP Agentkit Wrapper.
-            values["cdp_wallet_data"] = agent.cdp_wallet_data
         agentkit = CdpAgentkitWrapper(**values)
         # save the wallet after first create
         if not agent_data or not agent_data.cdp_wallet_data:
diff --git a/models/agent.py b/models/agent.py
index 7d4f322..ecb1bc0 100644
--- a/models/agent.py
+++ b/models/agent.py
@@ -85,9 +85,6 @@ class Agent(SQLModel, table=True):
     cdp_network_id: Optional[str] = Field(
         default="base-mainnet", description="Network identifier for CDP integration"
     )
-    cdp_wallet_data: SkipJsonSchema[Optional[str]] = Field(
-        default=None, description="Deprecated: CDP wallet information"
-    )
     # if twitter_enabled, the twitter_entrypoint will be enabled, twitter_config will be checked
     twitter_entrypoint_enabled: Optional[bool] = Field(
         default=False, description="Whether the agent can receive events from Twitter"
@@ -189,12 +186,9 @@ async def get(cls, agent_id: str) -> "Agent | None":
         async with get_session() as db:
             return (await db.exec(select(Agent).where(Agent.id == agent_id))).first()
 
-    async def create_or_update(self) -> "Agent":
+    async def create_or_update(self) -> ("Agent", bool):
         """Create the agent if not exists, otherwise update it.
 
-        Args:
-            db: Database session
-
         Returns:
             Agent: The created or updated agent
 
@@ -252,7 +246,7 @@ async def create_or_update(self) -> "Agent":
                     db.add(existing_agent)
                     await db.commit()
                     await db.refresh(existing_agent)
-                return existing_agent
+                return existing_agent, False
             else:
                 # Check upstream_id for idempotent
                 async with get_session() as db:
@@ -273,7 +267,7 @@ async def create_or_update(self) -> "Agent":
                     db.add(self)
                     await db.commit()
                     await db.refresh(self)
-                return self
+                return self, True
         except HTTPException:
             await db.rollback()
             raise