diff --git a/extension/Source/core/QuickFormQuery.php b/extension/Source/core/QuickFormQuery.php
index c28cbf557b54dfeccce28a64f3c6b24b89689ac2..01fd327d6940bd9e98111123269d0385422ab424 100644
--- a/extension/Source/core/QuickFormQuery.php
+++ b/extension/Source/core/QuickFormQuery.php
@@ -168,8 +168,11 @@ class QuickFormQuery {
 
         $this->store = Store::getInstance($bodytext, $phpUnit);
 
+        $timeout = $this->store::getVar(SYSTEM_SESSION_TIMEOUT_SECONDS, STORE_SYSTEM);
+        Session::checkSessionExpired($timeout);
+
         // If an FE user logs out and a different user logs in (same browser session) - the old values has to be destroyed!
-        if (Session::getAndDestroyFlagFeUserHasChanged() || Session::checkSessionExpired($timeout)) {
+        if (Session::getAndDestroyFlagFeUserHasChanged() ) {
             $this->store->unsetStore(STORE_USER);
         }