diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php
index 4b90e91..f264d7c 100644
--- a/DependencyInjection/FOSElasticaExtension.php
+++ b/DependencyInjection/FOSElasticaExtension.php
@@ -70,10 +70,9 @@ class FOSElasticaExtension extends Extension
     {
         $clientIds = array();
         foreach ($clients as $name => $clientConfig) {
-            $clientDef = $container->getDefinition('fos_elastica.client');
-            $clientDef->replaceArgument(0, $clientConfig);
-
             $clientId = sprintf('fos_elastica.client.%s', $name);
+            $clientDef = new Definition('%fos_elastica.client.class%', array($clientConfig));
+            $clientDef->addMethodCall('setLogger', array(new Reference('fos_elastica.logger')));
 
             $container->setDefinition($clientId, $clientDef);
 
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index 1540269..dfb417d 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -27,13 +27,6 @@
             <argument type="service" id="fos_elastica.logger" />
         </service>
 
-        <service id="fos_elastica.client" class="%fos_elastica.client.class%">
-            <argument /> <!-- config -->
-            <call method="setLogger">
-                <argument type="service" id="fos_elastica.logger" />
-            </call>
-        </service>
-
         <service id="fos_elastica.index_manager" class="FOS\ElasticaBundle\IndexManager">
             <argument /> <!-- indexes -->
             <argument /> <!-- default index -->