diff --git a/indexer-service-azure/src/main/java/org/opendes/indexer/azure/util/ServiceAccountJwtClientImpl.java b/indexer-service-azure/src/main/java/org/opendes/indexer/azure/util/ServiceAccountJwtClientImpl.java
index ae4e49f44f29b14c2fe6bd77c3ac04efc9a49424..11b5c781ddee02dc74f554bd0f33086f67a950b5 100644
--- a/indexer-service-azure/src/main/java/org/opendes/indexer/azure/util/ServiceAccountJwtClientImpl.java
+++ b/indexer-service-azure/src/main/java/org/opendes/indexer/azure/util/ServiceAccountJwtClientImpl.java
@@ -59,7 +59,7 @@ public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
             this.dpsHeaders.put(DpsHeaders.USER_EMAIL, tenant.getServiceAccount());
 
             if (!IdToken.refreshToken(cachedToken)) {
-                ACCESS_TOKEN = cachedToken.getTokenValue();
+                return cachedToken.getTokenValue();
             }
 
             ExecutorService service = Executors.newFixedThreadPool(1);
diff --git a/indexer-service-gcp/pom.xml b/indexer-service-gcp/pom.xml
index 7d6becdcad2b26f72bdceff0a9ead7623859121c..5e98051f7a2e82081eb27e8071a42c0afe9174e8 100644
--- a/indexer-service-gcp/pom.xml
+++ b/indexer-service-gcp/pom.xml
@@ -72,12 +72,6 @@
             <artifactId>appengine-gcs-client</artifactId>
             <version>0.8</version>
         </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-spring-boot</artifactId>
-            <version>2.1.7</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>