diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index b0a7b59..cb813a5 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -288,6 +288,7 @@ class Configuration implements ConfigurationInterface
                                     ->scalarNode('insert')->defaultTrue()->end()
                                     ->scalarNode('update')->defaultTrue()->end()
                                     ->scalarNode('delete')->defaultTrue()->end()
+                                    ->scalarNode('flush')->defaultTrue()->end()
                                     ->booleanNode('immediate')->defaultFalse()->end()
                                     ->scalarNode('logger')
                                         ->defaultFalse()
diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php
index ede7c21..7d754f1 100644
--- a/DependencyInjection/FOSElasticaExtension.php
+++ b/DependencyInjection/FOSElasticaExtension.php
@@ -465,9 +465,6 @@ class FOSElasticaExtension extends Extension
      */
     private function getDoctrineEvents(array $typeConfig)
     {
-        // Flush always calls depending on actions scheduled in lifecycle listeners
-        $typeConfig['listener']['flush'] = true;
-
         switch ($typeConfig['driver']) {
             case 'orm':
                 $eventsClass = '\Doctrine\ORM\Events';