diff --git a/core/lib/Thelia/Action/Address.php b/core/lib/Thelia/Action/Address.php
index 2195d946f..d5e245b97 100644
--- a/core/lib/Thelia/Action/Address.php
+++ b/core/lib/Thelia/Action/Address.php
@@ -36,7 +36,7 @@ use Thelia\Model\Map\AddressTableMap;
  * @package Thelia\Action
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class Address extends BaseAction implements EventSubscriberInterface
+class Address implements EventSubscriberInterface
 {
 
     public function create(AddressCreateOrUpdateEvent $event)
@@ -69,7 +69,7 @@ class Address extends BaseAction implements EventSubscriberInterface
 
     protected function createOrUpdate(AddressModel $addressModel, AddressCreateOrUpdateEvent $event)
     {
-        $addressModel->setDispatcher($this->getDispatcher());
+        $addressModel->setDispatcher($event->getDispatcher());
         $con = Propel::getWriteConnection(AddressTableMap::DATABASE_NAME);
         $con->beginTransaction();
         try {
diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml
index 118d96d2a..e2a6ce72b 100644
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -22,7 +22,6 @@
         </service>
 
         <service id="thelia.action.address" class="Thelia\Action\Address">
-            <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
diff --git a/core/lib/Thelia/Tests/Action/AddressTest.php b/core/lib/Thelia/Tests/Action/AddressTest.php
index 9c4198c06..ac74acec5 100644
--- a/core/lib/Thelia/Tests/Action/AddressTest.php
+++ b/core/lib/Thelia/Tests/Action/AddressTest.php
@@ -36,7 +36,7 @@ use Thelia\Tests\Action\BaseAction;
  * @package Thelia\Tests\Action
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class AddressTest extends BaseAction
+class AddressTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testCreatedAddress()
@@ -59,8 +59,9 @@ class AddressTest extends BaseAction
             ""
         );
         $AddressCreateOrUpdateEvent->setCustomer($customer);
+        $AddressCreateOrUpdateEvent->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
 
-        $actionAddress = new Address($this->getContainer());
+        $actionAddress = new Address();
         $actionAddress->create($AddressCreateOrUpdateEvent);
 
         $createdAddress = $AddressCreateOrUpdateEvent->getAddress();
@@ -106,6 +107,7 @@ class AddressTest extends BaseAction
             ""
         );
         $addressEvent->setAddress($address);
+        $addressEvent->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
 
         $actionAddress = new Address($this->getContainer());
         $actionAddress->update($addressEvent);