diff --git a/package-lock.json b/package-lock.json
index 890b545..9deaa3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@athenna/queue",
-  "version": "5.14.0",
+  "version": "5.15.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@athenna/queue",
-      "version": "5.14.0",
+      "version": "5.15.0",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-sqs": "^3.859.0"
diff --git a/package.json b/package.json
index 81bcd8a..633a0d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/queue",
-  "version": "5.14.0",
+  "version": "5.15.0",
   "description": "The Athenna queue handler.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
diff --git a/src/drivers/AwsSqsDriver.ts b/src/drivers/AwsSqsDriver.ts
index 54f3af6..d831eb0 100644
--- a/src/drivers/AwsSqsDriver.ts
+++ b/src/drivers/AwsSqsDriver.ts
@@ -142,20 +142,20 @@ export class AwsSqsDriver extends Driver<SQSClient> {
     }
 
     let sqsClientOptions: any = {
-        region: this.region,
-        credentials: {
-            accessKeyId: this.awsAccessKeyId,
-            secretAccessKey: this.awsSecretAccessKey
-        }
-    } 
+      region: this.region,
+      credentials: {
+        accessKeyId: this.awsAccessKeyId,
+        secretAccessKey: this.awsSecretAccessKey
+      }
+    }
 
     /**
      * If the AWS_SESSION_TOKEN is set, it means that the session is running inside
      * AWS. In this case, we can't set any options to SQSClient, otherwise the client
      * will fail to authenticate.
      */
-    if (Env('AWS_SESSION_TOKEN')) {
-        sqsClientOptions = {}
+    if (Is.Undefined(this.awsAccessKeyId) || Env('AWS_SESSION_TOKEN')) {
+      sqsClientOptions = {}
     }
 
     this.client = new SQSClient(sqsClientOptions)