diff --git a/src/FM/Keystone/Client/Factory.php b/src/FM/Keystone/Client/Factory.php
index <HASH>..<HASH> 100644
--- a/src/FM/Keystone/Client/Factory.php
+++ b/src/FM/Keystone/Client/Factory.php
@@ -93,6 +93,11 @@ class Factory implements EventSubscriberInterface
             /** @var \Guzzle\Http\Message\Request $request */
             $request = $event['request'];
 
+            // if this is the token-url, stop now because we won't be able to fetch a token
+            if ($request->getUrl() === $request->getClient()->getTokenUrl()) {
+                return;
+            }
+
             // see if we have retries left
             if ($request->hasHeader('X-Auth-Retries')) {
                 $headerValues = $request->getHeader('X-Auth-Retries')->toArray();
Fixed a bug which could cause infinite recursion when obtaining a token