diff --git a/setup/index.php b/setup/index.php
index 1728bf871..c98ea1d8d 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -33,6 +33,8 @@ ini_set('display_errors', true);
 ini_set('display_startup_errors', true);
 date_default_timezone_set('Europe/Paris'); // Just to avoid a warning if the timezone is not set in php.ini
 
+SetupUtils::ExitMaintenanceMode(false);
+
 /////////////////////////////////////////////////////////////////////
 // Fake functions to protect the first run of the installer
 // in case the PHP JSON module is not installed...
diff --git a/setup/wizardcontroller.class.inc.php b/setup/wizardcontroller.class.inc.php
index 2615db0a4..18a026ba3 100644
--- a/setup/wizardcontroller.class.inc.php
+++ b/setup/wizardcontroller.class.inc.php
@@ -173,7 +173,6 @@ class WizardController
 				// The configuration file already exists
 				if (!is_writable($sConfigFile))
 				{
-					SetupUtils::ExitMaintenanceMode(false); // Reset maintenance mode in case of problem
 					SetupUtils::ExitReadOnlyMode(false); // Reset readonly mode in case of problem
 
 					$sRelativePath = utils::GetConfigFilePathRelative();