diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
index 58ea6f0a54..f68716c144 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -35,6 +35,7 @@ class RouterListener implements EventSubscriberInterface
     private $matcher;
     private $context;
     private $logger;
+    private $request;
 
     /**
      * Constructor.
@@ -72,9 +73,10 @@ class RouterListener implements EventSubscriberInterface
      */
     public function setRequest(Request $request = null)
     {
-        if (null !== $request) {
+        if (null !== $request && $this->request !== $request) {
             $this->context->fromRequest($request);
         }
+        $this->request = $request;
     }
 
     public function onKernelRequest(GetResponseEvent $event)