diff --git a/openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java b/openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java
index e36fe4fab2b..4494619ad46 100644
--- a/openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java
+++ b/openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java
@@ -27,7 +27,6 @@
 import com.inrupt.client.auth.Session;
 import com.inrupt.client.spi.AuthenticationProvider;
 
-import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.CompletableFuture;
@@ -111,13 +110,8 @@ public int getPriority() {
         @Override
         public CompletionStage<Credential> authenticate(final Session session, final Request request,
                 final Set<String> algorithms) {
-            final Optional<CompletionStage<Credential>> token = session
-                .getCredential(OpenIdSession.ID_TOKEN, request.uri())
-                .map(CompletableFuture::completedFuture);
-            return token
-                .orElseGet(() -> session.authenticate(request, algorithms)
-                    .thenApply(credential -> credential
-                        .orElseThrow(() -> new OpenIdException("Unable to perform OpenID authentication"))));
+            return CompletableFuture.completedFuture(session
+                    .getCredential(OpenIdSession.ID_TOKEN, request.uri()).orElse(null));
         }
     }
 }