diff --git a/Classes/Controller/QueueController.php b/Classes/Controller/QueueController.php
index 0268598e7110f2aac9a326dde992cd05b7126f77..742e5f2df3fa1ef8d789e3be5e266de3b08714de 100644
--- a/Classes/Controller/QueueController.php
+++ b/Classes/Controller/QueueController.php
@@ -52,11 +52,10 @@ class QueueController extends ActionController {
 	public function indexAction($selectedTemplate = NULL, $selectedExtension = NULL) {
 		$registerArray = MailTemplateService::getRegisterArray();
 
-		if ($selectedTemplate === NULL) {
+		if ($selectedTemplate === NULL || $selectedTemplate == '') {
 			$selectedExtension = key($registerArray);
 			$selectedTemplate = key($registerArray[$selectedExtension]);
 		}
-
 		$queue = $this->mailRepository->findAllEntries($selectedExtension, $selectedTemplate);
 
 		$this->view->assign('selectedTemplateKey', $selectedTemplate);