diff --git a/Classes/Controller/QueueController.php b/Classes/Controller/QueueController.php
index 7ffb769f428d2f42d59aee219e6a310d122acc21..0f581230150bc6f6d51c0bf09209e7fced70caad 100644
--- a/Classes/Controller/QueueController.php
+++ b/Classes/Controller/QueueController.php
@@ -228,7 +228,13 @@ class QueueController extends ActionController {
 			$this->session->setDataByKey('mode', $this->request->getArgument('controller'));
 		}
 
-		$filterTemplate = $_POST['filterTemplate'];
+		// save the Template filter to the session
+		if (!isset($_SESSION[$this->session->getSessionKey()]['filterTemplate'])
+			|| (isset($_POST['filterTemplate']) && $this->session->getDataByKey('filterTemplate') !== $_POST['filterTemplate'])) {
+			$this->session->setDataByKey('filterTemplate', $_POST['filterTemplate']);
+		}
+
+		$filterTemplate = $this->session->getDataByKey('filterTemplate') ?? $_POST['filterTemplate'];
 		$filters['filterExtension'] = $filterTemplate;
 		$filters['filterTemplate'] = $filterTemplate;