diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index b9da716..1e49590 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -85,10 +85,10 @@
         </service>
 
         <service id="fos_elastica.paginator.subscriber" class="FOS\ElasticaBundle\Subscriber\PaginateElasticaQuerySubscriber">
-            <tag name="knp_paginator.subscriber" />
-            <call method="setContainer">
-                <argument type="service" id="service_container" />
+            <call method="setRequest">
+                <argument type="service" id="request" on-invalid="null" strict="false" />
             </call>
+            <tag name="knp_paginator.subscriber" />
         </service>
 
         <service id="fos_elastica.property_accessor" class="%fos_elastica.property_accessor.class%" />
diff --git a/Subscriber/PaginateElasticaQuerySubscriber.php b/Subscriber/PaginateElasticaQuerySubscriber.php
index fc775c7..0b7cfd6 100644
--- a/Subscriber/PaginateElasticaQuerySubscriber.php
+++ b/Subscriber/PaginateElasticaQuerySubscriber.php
@@ -2,6 +2,7 @@
 
 namespace FOS\ElasticaBundle\Subscriber;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Knp\Component\Pager\Event\ItemsEvent;
 use FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface;
@@ -9,19 +10,18 @@ use FOS\ElasticaBundle\Paginator\PartialResultsInterface;
 
 class PaginateElasticaQuerySubscriber implements EventSubscriberInterface
 {
-    private $container;
+    private $request;
 
-    public function setContainer($container)
+    public function setRequest(Request $request = null)
     {
-        $this->container = $container;
+        $this->request = $request;
     }
 
     public function items(ItemsEvent $event)
     {
         if ($event->target instanceof PaginatorAdapterInterface) {
-
             // Add sort to query
-            $this->addPagingSort($event);
+            $this->setSorting($event);
 
             /** @var $results PartialResultsInterface */
             $results = $event->target->getResults($event->getOffset(), $event->getLimit());
@@ -40,19 +40,17 @@ class PaginateElasticaQuerySubscriber implements EventSubscriberInterface
     /**
      * Adds knp paging sort to query
      *
-     * @param ItemsEvent $event 
-     * @return void
+     * @param ItemsEvent $event
      */
-    protected function addPagingSort(ItemsEvent $event)
+    protected function setSorting(ItemsEvent $event)
     {
-        $request = $this->container->get('request');
         $options = $event->options;
-        $sortField = $request->get($options['sortFieldParameterName']);
+        $sortField = $this->request->get($options['sortFieldParameterName']);
 
         if (!empty($sortField)) {
             // determine sort direction
             $dir = 'asc';
-            $sortDirection = $request->get($options['sortDirectionParameterName']);
+            $sortDirection = $this->request->get($options['sortDirectionParameterName']);
             if ('desc' === strtolower($sortDirection)) {
                 $dir = 'desc';
             }