diff --git a/src/EzPlatformCoreBundle/bundle/DependencyInjection/Compiler/SessionConfigurationPass.php b/src/EzPlatformCoreBundle/bundle/DependencyInjection/Compiler/SessionConfigurationPass.php
index 947c8cc..8844a45 100644
--- a/src/EzPlatformCoreBundle/bundle/DependencyInjection/Compiler/SessionConfigurationPass.php
+++ b/src/EzPlatformCoreBundle/bundle/DependencyInjection/Compiler/SessionConfigurationPass.php
@@ -58,13 +58,21 @@ public function process(ContainerBuilder $container)
                 $container
                     ->getDefinition('session.storage.native')
                     ->replaceArgument(1, new Reference('session.handler'));
+            }
+
+            if ($container->hasDefinition('session.storage.php_bridge')) {
                 $container
                     ->getDefinition('session.storage.php_bridge')
                     ->replaceArgument(0, new Reference('session.handler'));
-            } else {
+            }
+
+            if ($container->hasDefinition('session.storage.factory.native')) {
                 $container
                     ->getDefinition('session.storage.factory.native')
                     ->replaceArgument(1, new Reference('session.handler'));
+            }
+
+            if ($container->hasDefinition('session.storage.factory.php_bridge')) {
                 $container
                     ->getDefinition('session.storage.factory.php_bridge')
                     ->replaceArgument(0, new Reference('session.handler'));