diff --git a/lib/claims/agent-registrations.js b/lib/claims/agent-registrations.js
index 22422f2..3fecc2e 100644
--- a/lib/claims/agent-registrations.js
+++ b/lib/claims/agent-registrations.js
@@ -2,6 +2,9 @@
 
 const db = require('../db');
 
+const DEFAULT_ERC8004_CHAIN_ID = 'eip155:8453';
+const DEFAULT_ERC8004_REGISTRY_ADDRESS = '0x8004A169FB4a3325136EB29fA0ceB6D2e539a432';
+
 /** Idempotently records card discovery metadata; it does not perform registration or verification. */
 async function upsertErc8004Registration({ claimId, ens, chainId, registryAddress, agentUri = null, agentCardCid = null, metadata = null }) {
   if (!claimId || !ens || !chainId || !registryAddress) {
@@ -24,9 +27,8 @@ async function upsertErc8004Registration({ claimId, ens, chainId, registryAddres
 }
 
 async function trackPinnedCardRegistration(card) {
-  const chainId = process.env.ERC8004_CHAIN_ID;
-  const registryAddress = process.env.ERC8004_REGISTRY_ADDRESS;
-  if (!chainId || !registryAddress) return null;
+  const chainId = process.env.ERC8004_CHAIN_ID || DEFAULT_ERC8004_CHAIN_ID;
+  const registryAddress = process.env.ERC8004_REGISTRY_ADDRESS || DEFAULT_ERC8004_REGISTRY_ADDRESS;
   return upsertErc8004Registration({
     claimId: card.claim_id,
     ens: card.ens,