diff --git a/typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php b/typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php
index 8c23a7e7cf70a23fa4edb3d25bb21b92b91fcb3b..6422a9085fc8e95e7ff6412b598f888628aef51c 100644
--- a/typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php
+++ b/typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php
@@ -151,16 +151,14 @@ class CacheHashCalculator implements SingletonInterface
 
     /**
      * Checks whether the given parameter is out of a known data-set starting
-     * with ADMCMD or starts with TSFE_ADMIN_PANEL.
+     * with ADMCMD.
      *
      * @param string $key
      * @return bool
      */
     protected function isAdminPanelParameter($key)
     {
-        return $key === 'ADMCMD_noBeUser' || $key === 'ADMCMD_view' || $key === 'ADMCMD_editIcons'
-            || $key === 'ADMCMD_simUser' || $key === 'ADMCMD_simTime' || $key === 'ADMCMD_prev'
-            || stripos($key, 'TSFE_ADMIN_PANEL') !== false && preg_match('/TSFE_ADMIN_PANEL\\[.*?\\]/', $key);
+        return $key === 'ADMCMD_noBeUser' || $key === 'ADMCMD_simUser' || $key === 'ADMCMD_simTime' || $key === 'ADMCMD_prev';
     }
 
     /**
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
index dc33391bb563d19818f4b5b1fe0fa0cda56693dd..bc10e93a86299961f674df9d4ebe1e780b4c0ba1 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
@@ -163,7 +163,6 @@ class CacheHashCalculatorTest extends UnitTestCase
             'Only the relevant parts should be taken into account' => ['&id=42&key=value&exclude1=val', $knowHash],
             'Only the relevant parts should be taken into account(exclude2 before key)' => ['&id=42&exclude2=val&key=value', $knowHash],
             'System parameters should not be taken into account (except id)' => ['&id=42&type=23&key=value', $knowHash],
-            'Admin panel parameters should not be taken into account' => ['&id=42&TSFE_ADMIN_PANEL[display]=7&key=value', $knowHash],
             'Trivial hash for sorted parameters should be right' => ['&id=42&a=v&b=v', '52c8a1299e20324f90377c43153c4987'],
             'Parameters should be sorted before cHash is created' => ['&id=42&b=v&a=v', '52c8a1299e20324f90377c43153c4987'],
             'Empty argument names are filtered out before cHash calculation' => ['&id=42&b=v&a=v&=dummy', '52c8a1299e20324f90377c43153c4987']
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index fb4f22bfa53e581f38d8626c56ce945651bbdef8..cc443d2b2e0ece334f3a357cd2bcacce6fa12e65 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -150,16 +150,14 @@ class PreviewController
                 $queryParameters['_language'] = $site->getLanguageById((int)$queryParameters['L']);
                 unset($queryParameters['L']);
             }
+            $parameters = $queryParameters;
             if (!WorkspaceService::isNewPage($this->pageId)) {
-                $parameters = $queryParameters;
                 $parameters['ADMCMD_noBeUser'] = 1;
                 $parameters['ADMCMD_prev'] = 'IGNORE';
                 $liveUrl = (string)$site->getRouter()->generateUri($this->pageId, $parameters);
             }
 
             $parameters = $queryParameters;
-            $parameters['ADMCMD_view'] = 1;
-            $parameters['ADMCMD_editIcons'] = 1;
             $parameters['ADMCMD_prev'] = 'IGNORE';
             $wsUrl = (string)$site->getRouter()->generateUri($this->pageId, $parameters);
         } catch (SiteNotFoundException | InvalidRouteArgumentsException $e) {