diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index cd3e17c7f5..a106feae99 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -232,7 +232,7 @@ class ProfilerController
             $session->getFlashBag()->setAll($session->getFlashBag()->peekAll());
         }
 
-        if (null === $token) {
+        if ('empty' === $token || null === $token) {
             return new Response('', 200, array('Content-Type' => 'text/html'));
         }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
new file mode 100644
index 0000000000..bff1919aa9
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController;
+use Symfony\Component\HttpKernel\Profiler\Profile;
+use Symfony\Component\HttpFoundation\Request;
+
+class ProfilerControllerTest extends TestCase
+{
+    /**
+     * @dataProvider getEmptyTokenCases
+     */
+    public function testEmptyToken($token)
+    {
+        $urlGenerator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
+        $twig = $this->getMock('Twig_Environment');
+        $profiler = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $controller = new ProfilerController($urlGenerator, $profiler, $twig, array());
+
+        $response = $controller->toolbarAction(Request::create('/_wdt/empty'), $token);
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    public function getEmptyTokenCases()
+    {
+        return array(
+            array(null),
+            // "empty" is also a valid empty token case, see https://github.com/symfony/symfony/issues/10806
+            array('empty'),
+        );
+    }
+
+    public function testReturns404onTokenNotFound()
+    {
+        $urlGenerator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
+        $twig = $this->getMock('Twig_Environment');
+        $profiler = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $controller = new ProfilerController($urlGenerator, $profiler, $twig, array());
+
+        $profiler
+            ->expects($this->exactly(2))
+            ->method('loadProfile')
+            ->will($this->returnCallback(function ($token) {
+                if ('found' == $token) {
+                    return new Profile($token);
+                }
+
+                return;
+            }))
+        ;
+
+        $response = $controller->toolbarAction(Request::create('/_wdt/found'), 'found');
+        $this->assertEquals(200, $response->getStatusCode());
+
+        $response = $controller->toolbarAction(Request::create('/_wdt/notFound'), 'notFound');
+        $this->assertEquals(404, $response->getStatusCode());
+    }
+}