diff --git a/application/views/scripts/form/setup-summary.phtml b/application/views/scripts/form/setup-summary.phtml
index 3a1b1b5bc..bd5b1651b 100644
--- a/application/views/scripts/form/setup-summary.phtml
+++ b/application/views/scripts/form/setup-summary.phtml
@@ -13,9 +13,11 @@ use Icinga\Web\Wizard;
 ); ?></p>
 <div class="summary">
 <?php foreach ($form->getSummary() as $pageHtml): ?>
+ <?php if ($pageHtml): ?>
   <div class="page">
     <?= $pageHtml; ?>
   </div>
+ <?php endif ?>
 <?php endforeach ?>
 </div>
 <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
diff --git a/application/views/scripts/setup/parts/install.phtml b/application/views/scripts/setup/parts/install.phtml
index ce8262500..dc47c3408 100644
--- a/application/views/scripts/setup/parts/install.phtml
+++ b/application/views/scripts/setup/parts/install.phtml
@@ -2,7 +2,7 @@
   <div class="report">
   <?php $firstLine = true; ?>
   <?php foreach ($report as $entry): ?>
-    <?php if ($entry !== ''): ?>
+    <?php if ($entry): ?>
       <?php if (false === $firstLine): ?>
         <div class="line-separator"></div>
       <?php endif ?>
diff --git a/library/Icinga/Installation/DatabaseStep.php b/library/Icinga/Installation/DatabaseStep.php
index 42449703a..2b220baf6 100644
--- a/library/Icinga/Installation/DatabaseStep.php
+++ b/library/Icinga/Installation/DatabaseStep.php
@@ -235,8 +235,6 @@ class DatabaseStep extends Step
             return '<p>' . join('</p><p>', $this->messages) . '</p>'
                 . '<p class="error">' . $message . '</p><p>' . $this->error->getMessage() . '</p>';
         }
-
-        return '';
     }
 
     protected function log()
diff --git a/library/Icinga/Installation/GeneralConfigStep.php b/library/Icinga/Installation/GeneralConfigStep.php
index 72ad122de..97823283e 100644
--- a/library/Icinga/Installation/GeneralConfigStep.php
+++ b/library/Icinga/Installation/GeneralConfigStep.php
@@ -128,7 +128,5 @@ class GeneralConfigStep extends Step
             return '<p class="error">' . sprintf($message, Config::resolvePath('config.ini')) . '</p>'
                 . '<p>' . $this->error->getMessage() . '</p>';
         }
-
-        return '';
     }
 }
diff --git a/library/Icinga/Installation/ResourceStep.php b/library/Icinga/Installation/ResourceStep.php
index 455f9ba8f..d51d38bc4 100644
--- a/library/Icinga/Installation/ResourceStep.php
+++ b/library/Icinga/Installation/ResourceStep.php
@@ -146,7 +146,5 @@ class ResourceStep extends Step
             return '<p class="error">' . sprintf($message, Config::resolvePath('resources.ini')) . '</p>'
                 . '<p>' . $this->error->getMessage() . '</p>';
         }
-
-        return '';
     }
 }