1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 023723c3b3..758d0dc0f6 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -14,6 +14,7 @@ use Piwik\Config;
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugins\Installation\Exception\DatabaseConnectionFailedException;
+use Piwik\SettingsPiwik;
 use Piwik\View as PiwikView;
 
 /**
@@ -62,6 +63,10 @@ class Installation extends \Piwik\Plugin
     {
         $general = Config::getInstance()->General;
 
+        if (!SettingsPiwik::isPiwikInstalled() && !$general['enable_installer']) {
+            throw new \Exception('Piwik is not set up yet');
+        }
+
         if (empty($general['installation_in_progress'])) {
             return;
         }