diff --git a/lib/Controller.php b/lib/Controller.php
index 08192d4d..1d726da5 100644
--- a/lib/Controller.php
+++ b/lib/Controller.php
@@ -216,6 +216,9 @@ class Controller
     {
         $templates = $this->_conf->getKey('availabletemplates');
         $template  = $this->_conf->getKey('template');
+        if (!in_array($template, $templates, true)) {
+            $templates[] = $template;
+        }
         TemplateSwitcher::setAvailableTemplates($templates);
         TemplateSwitcher::setTemplateFallback($template);