diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 75c0bc0b2..6e147df98 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -104,7 +104,7 @@ class TagController extends AbstractController
             $this->entityManager->flush();
         }
 
-        $redirectUrl = $this->redirectHelper->to($request->headers->get('prevUrl'), '', true);
+        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'), '', true);
 
         return $this->redirect($redirectUrl);
     }
@@ -185,7 +185,7 @@ class TagController extends AbstractController
         $form = $this->createForm(RenameTagType::class, new Tag());
         $form->handleRequest($request);
 
-        $redirectUrl = $this->redirectHelper->to($request->headers->get('prevUrl'), '', true);
+        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'), '', true);
 
         if ($form->isSubmitted() && $form->isValid()) {
             $newTag = new Tag();
@@ -257,7 +257,7 @@ class TagController extends AbstractController
             $this->entityManager->flush();
         }
 
-        return $this->redirect($this->redirectHelper->to($request->headers->get('prevUrl'), '', true));
+        return $this->redirect($this->redirectHelper->to($request->getSession()->get('prevUrl'), '', true));
     }
 
     /**
@@ -279,7 +279,7 @@ class TagController extends AbstractController
             $this->entityManager->remove($tag);
             $this->entityManager->flush();
         }
-        $redirectUrl = $this->redirectHelper->to($request->headers->get('prevUrl'), '', true);
+        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'), '', true);
 
         return $this->redirect($redirectUrl);
     }