diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php
index ea65ffa51..c159aad36 100644
--- a/setup/runtimeenv.class.inc.php
+++ b/setup/runtimeenv.class.inc.php
@@ -648,7 +648,8 @@ class RunTimeEnvironment
 		}
 	}
 
-	public function SetDbUUID() : void {
+	public function SetDbUUID(): void
+	{
 		// Set a DBProperty with a unique ID to identify this instance of iTop
 		$sUUID = DBProperty::GetProperty('database_uuid', '');
 		if ($sUUID === '') {
diff --git a/setup/sequencers/ApplicationInstallSequencer.php b/setup/sequencers/ApplicationInstallSequencer.php
index 9282343c3..08490685f 100644
--- a/setup/sequencers/ApplicationInstallSequencer.php
+++ b/setup/sequencers/ApplicationInstallSequencer.php
@@ -134,11 +134,11 @@ class ApplicationInstallSequencer extends StepSequencer
 						$aSelectedExtensionCodes,
 						$sInstallComment
 					);
-					$this->oRunTimeEnvironment->ExitReadOnlyMode();
 					return $this->ComputeNextStep($sStep);
 
 				case 'commit':
 					$this->oRunTimeEnvironment->Commit();
+					$this->oRunTimeEnvironment->ExitReadOnlyMode();
 					return $this->GetNextStep('', 'Completed', 100);
 
 				default:
diff --git a/setup/sequencers/DataAuditSequencer.php b/setup/sequencers/DataAuditSequencer.php
index f3c8f3023..d7412be3f 100644
--- a/setup/sequencers/DataAuditSequencer.php
+++ b/setup/sequencers/DataAuditSequencer.php
@@ -35,7 +35,7 @@ class DataAuditSequencer extends StepSequencer
 	{
 		try {
 			$fStart = microtime(true);
-			
+
 			/**
 			 * @since 3.2.0 move the ContextTag init at the very beginning of the method
 			 * @noinspection PhpUnusedLocalVariableInspection
diff --git a/tests/php-unit-tests/unitary-tests/setup/sequencers/ApplicationInstallerSequencerTest.php b/tests/php-unit-tests/unitary-tests/setup/sequencers/ApplicationInstallerSequencerTest.php
index 57d6d816c..8aeefcc3c 100644
--- a/tests/php-unit-tests/unitary-tests/setup/sequencers/ApplicationInstallerSequencerTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/sequencers/ApplicationInstallerSequencerTest.php
@@ -306,7 +306,6 @@ class ApplicationInstallerSequencerTest extends ItopTestCase
 		$this->GivenApplicationInstallSequencer($aAdditionalParams);
 		$this->oRunTimeEnvironment->expects($this->once())->method('DoCreateConfig')
 			->with($this->oConfig, "6.6.6", ["a" => "b"], ["c" => "d"], null);
-		$this->oRunTimeEnvironment->expects($this->once())->method('ExitReadOnlyMode');
 
 		$aRes = $this->oSequencer->ExecuteStep('create-config');
 		$aExpected = [
@@ -322,6 +321,9 @@ class ApplicationInstallerSequencerTest extends ItopTestCase
 	public function testCommit()
 	{
 		$this->GivenApplicationInstallSequencer();
+		$this->oRunTimeEnvironment->expects($this->once())->method('Commit');
+		$this->oRunTimeEnvironment->expects($this->once())->method('ExitReadOnlyMode');
+
 		$aRes = $this->oSequencer->ExecuteStep('commit');
 		$aExpected = [
 			'message' => '',