diff --git a/DataStorage/Session/HttpSession.php b/DataStorage/Session/HttpSession.php
index ec3ab676b..d27a40f44 100644
--- a/DataStorage/Session/HttpSession.php
+++ b/DataStorage/Session/HttpSession.php
@@ -64,8 +64,11 @@ class HttpSession implements SessionInterface
         $this->sid = session_id();
         session_write_close();
 
-        $CSRF = StringUtils::generateString(10, 16);
-        $this->set('CSRF', $CSRF, false);
+        if(($CSRF = $this->get('CSRF')) === null) {
+            $CSRF = StringUtils::generateString(10, 16);
+            $this->set('CSRF', $CSRF, false);
+        }
+
         UriFactory::setQuery('$CSRF', $CSRF);
     }