diff --git a/src/app/api/v1/payment-links/route.ts b/src/app/api/v1/payment-links/route.ts
index aa7e98a..4f51f71 100644
--- a/src/app/api/v1/payment-links/route.ts
+++ b/src/app/api/v1/payment-links/route.ts
@@ -118,7 +118,7 @@ export async function POST(req: NextRequest) {
     method: 'POST',
     status_code: 201,
     request_body: body,
-    ip_address: clientIp.split(',')[0]
+    ip_address: clientIp.split(',')[0].trim()
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   }).then(({ error }: any) => {
     if(error) console.error('Failed to log API call', error)
diff --git a/src/lib/api/verify-api-key.ts b/src/lib/api/verify-api-key.ts
index 9b858a8..fc504ef 100644
--- a/src/lib/api/verify-api-key.ts
+++ b/src/lib/api/verify-api-key.ts
@@ -57,7 +57,7 @@ export async function verifyApiKey(req: NextRequest) {
         endpoint: req.nextUrl.pathname,
         method: req.method,
         status_code: 200, // Assumed success if we get here
-        ip_address: req.headers.get('x-forwarded-for') || 'unknown',
+        ip_address: (req.headers.get('x-forwarded-for') || 'unknown').split(',')[0].trim(),
         user_agent: req.headers.get('user-agent') || 'unknown'
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       }).then(({ error }: any) => {
diff --git a/src/providers.tsx b/src/providers.tsx
index 264c46a..c5b8398 100644
--- a/src/providers.tsx
+++ b/src/providers.tsx
@@ -69,24 +69,22 @@ const solanaAdapter = new SolanaAdapter({
 })
 
 // Initialize AppKit modal (runs once at module load)
-if (projectId) {
-  createAppKit({
-    adapters: [wagmiAdapter, solanaAdapter],
-    projectId,
-    networks: mainnetNetworks as [AppKitNetwork, ...AppKitNetwork[]],
-    defaultNetwork: allNetworks.mainnet,
-    metadata: {
-      name: 'Flash Protocol',
-      description: 'Cross-chain payment gateway',
-      url: typeof window !== 'undefined' ? window.location.origin : 'https://flashprotocol.com',
-      icons: ['/logo-black.png'],
-    },
-    features: {
-      analytics: false,
-    },
-    themeMode: 'dark',
-  })
-}
+createAppKit({
+  adapters: [wagmiAdapter, solanaAdapter],
+  projectId: projectId || 'fallback-project-id', // Ensure AppKit initializes even if NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID is missing during build time
+  networks: mainnetNetworks as [AppKitNetwork, ...AppKitNetwork[]],
+  defaultNetwork: allNetworks.mainnet,
+  metadata: {
+    name: 'Flash Protocol',
+    description: 'Cross-chain payment gateway',
+    url: typeof window !== 'undefined' ? window.location.origin : 'https://flashprotocol.com',
+    icons: ['/logo-black.png'],
+  },
+  features: {
+    analytics: false,
+  },
+  themeMode: 'dark',
+})
 
 export function Providers({ children }: { children: ReactNode }) {
   return (