diff --git a/src/auth-service/models/AccessToken.js b/src/auth-service/models/AccessToken.js
index cdcd0e90d3..2545d0c3ed 100644
--- a/src/auth-service/models/AccessToken.js
+++ b/src/auth-service/models/AccessToken.js
@@ -41,7 +41,7 @@ const AccessTokenSchema = new mongoose.Schema(
       required: [true, "token is required!"],
     },
     last_used_at: { type: Date },
-    last_ip_address: { type: Date },
+    last_ip_address: { type: String },
     expires_in: { type: Number },
     expires: {
       type: Date,
diff --git a/src/auth-service/utils/token.util.js b/src/auth-service/utils/token.util.js
index 88d3903cb6..c7f10bb66a 100644
--- a/src/auth-service/utils/token.util.js
+++ b/src/auth-service/utils/token.util.js
@@ -771,10 +771,14 @@ const token = {
           const endTime = process.hrtime.bigint();
           const latency = calculateLatency(startTime, endTime);
 
-          await AccessTokenModel("airqo").updateOne(
-            { token },
-            { $set: { last_used_at: new Date(), last_ip_address: ip } }
-          );
+          try {
+            await AccessTokenModel("airqo").updateOne(
+              { token },
+              { $set: { last_used_at: new Date(), last_ip_address: ip } }
+            );
+          } catch (updateError) {
+            logger.error(`Error updating AccessToken: ${updateError.message}`);
+          }
           const logPayload = {
             timestamp: new Date().toISOString(),
             token: accessToken.token,
@@ -786,10 +790,12 @@ const token = {
             latency: latency,
           };
 
-          if (constants.ENVIRONMENT === "PRODUCTION ENVIRONMENT") {
+          try {
+            await logAPIUsage(logPayload);
+            apiUsageLogger.info(stringify(logPayload));
+          } catch (loggingError) {
+            logger.error(`Error logging API Usage: ${loggingError.message}`);
           }
-          await logAPIUsage(logPayload);
-          apiUsageLogger.info(stringify(logPayload)); // Log to stdout (for BigQuery)
 
           return createValidTokenResponse();
         }