diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php
index e14d6794..dca6d5a6 100644
--- a/code/Controllers/ContentController.php
+++ b/code/Controllers/ContentController.php
@@ -435,8 +435,8 @@ HTML;
     public function getViewer($action)
     {
         // Manually set templates should be dealt with by Controller::getViewer()
-        if (isset($this->templates[$action]) && $this->templates[$action]
-            || (isset($this->templates['index']) && $this->templates['index'])
+        if (!empty($this->templates[$action])
+            || !empty($this->templates['index'])
             || $this->template
         ) {
             return parent::getViewer($action);