diff --git a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
index 38ca0a0665..26d5852be4 100644
--- a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
@@ -165,10 +165,6 @@ class GuardAuthenticationListener implements ListenerInterface
      */
     private function triggerRememberMe(GuardAuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, Response $response = null)
     {
-        if (!$guardAuthenticator->supportsRememberMe()) {
-            return;
-        }
-
         if (null === $this->rememberMeServices) {
             if (null !== $this->logger) {
                 $this->logger->info('Remember me skipped: it is not configured for the firewall.', array('authenticator' => get_class($guardAuthenticator)));
@@ -177,6 +173,14 @@ class GuardAuthenticationListener implements ListenerInterface
             return;
         }
 
+        if (!$guardAuthenticator->supportsRememberMe()) {
+            if (null !== $this->logger) {
+                $this->logger->info('Remember me skipped: your authenticator does not support it.', array('authenticator' => get_class($guardAuthenticator)));
+            }
+
+            return;
+        }
+
         if (!$response instanceof Response) {
             throw new \LogicException(sprintf(
                 '%s::onAuthenticationSuccess *must* return a Response if you want to use the remember me functionality. Return a Response, or set remember_me to false under the guard configuration.',