diff --git a/library/src/main/java/de/rheinfabrik/heimdall2/OAuth2AccessTokenManager.kt b/library/src/main/java/de/rheinfabrik/heimdall2/OAuth2AccessTokenManager.kt
index d9e4c90..46587fc 100644
--- a/library/src/main/java/de/rheinfabrik/heimdall2/OAuth2AccessTokenManager.kt
+++ b/library/src/main/java/de/rheinfabrik/heimdall2/OAuth2AccessTokenManager.kt
@@ -30,7 +30,7 @@ open class OAuth2AccessTokenManager(
     ): Single<OAuth2AccessToken> =
         grant.grantNewAccessToken()
             .map {
-                val token = if (it.expiresIn != null) {
+                if (it.expiresIn != null) {
                     val newExpirationDate = (calendar.clone() as Calendar).apply {
                         add(Calendar.SECOND, it.expiresIn)
                     }
@@ -38,7 +38,6 @@ open class OAuth2AccessTokenManager(
                 } else {
                     it
                 }
-                token
             }
             .doOnSuccess { token ->
                 mStorage.storeAccessToken(