diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index f48f0a53cc..776861168d 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -1576,7 +1576,7 @@ JS
 	 * @return array
 	 * @throws Exception
 	 */
-	public static function AnalyzeInstallation($oWizard, $bAbortOnMissingDependency = false, $aModulesToLoad = null, Config $oConfig = null)
+	public static function AnalyzeInstallation($oWizard, $bAbortOnMissingDependency = false, $aModulesToLoad = null, ?Config $oConfig = null)
 	{
 		require_once(APPROOT.'/setup/moduleinstaller.class.inc.php');
 
diff --git a/setup/wizardsteps/WizStepModulesChoice.php b/setup/wizardsteps/WizStepModulesChoice.php
index 03bc4cddb3..aaea78c741 100644
--- a/setup/wizardsteps/WizStepModulesChoice.php
+++ b/setup/wizardsteps/WizStepModulesChoice.php
@@ -80,7 +80,9 @@ class WizStepModulesChoice extends AbstractWizStepInstall
 
 		// Sanity check (not stopper, to let developers go further...)
 		try {
-			$this->aAnalyzeInstallationModules = SetupUtils::AnalyzeInstallation($this->oWizard, true, null, $this->oConfig);
+			$aModulesToLoad = json_decode($oWizard->GetParameter('selected_modules'), true) ?? null;
+			SetupLog::Error(__METHOD__, null, [$aModulesToLoad]);
+			$this->aAnalyzeInstallationModules = SetupUtils::AnalyzeInstallation($this->oWizard, true, $aModulesToLoad, $this->oConfig);
 		} catch (MissingDependencyException $e) {
 			$this->oMissingDependencyException = $e;
 			$this->aAnalyzeInstallationModules = SetupUtils::AnalyzeInstallation($this->oWizard);
@@ -187,7 +189,6 @@ class WizStepModulesChoice extends AbstractWizStepInstall
 
 	public function GetSelectedComponents(array $aSteps, string $sSelectedExtensionJson): array
 	{
-		SetupLog::Error(__METHOD__, null, $aSteps);
 		$aExtensions = json_decode($sSelectedExtensionJson, true);
 		$aRes = [];
 		foreach ($aSteps as $i => $aStepInfo) {