diff --git a/lib/ansible/galaxy/token.py b/lib/ansible/galaxy/token.py
index 1efc40f9871..0f9f3ee19df 100644
--- a/lib/ansible/galaxy/token.py
+++ b/lib/ansible/galaxy/token.py
@@ -67,7 +67,7 @@ class KeycloakToken(object):
             payload['client_secret'] = self.client_secret
             payload['scope'] = 'api.console'
             payload['grant_type'] = 'client_credentials'
-            if self.access_token:
+            if self.access_token not in (None, NoTokenSentinel):
                 display.warning(
                     'Found both a client_secret and access_token for galaxy authentication, ignoring access_token'
                 )