diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php
index 6ecaf880063c5..f682b0c43b464 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php
@@ -45,7 +45,7 @@ private function registerCsrfProtectionListener(ContainerBuilder $container)
 
     protected function registerLogoutHandler(ContainerBuilder $container)
     {
-        if (!$container->has('security.logout_listener')) {
+        if (!$container->has('security.logout_listener') || !$container->has('security.csrf.token_storage')) {
             return;
         }