diff --git a/issue-bot/src/Console/DownloadCommand.php b/issue-bot/src/Console/DownloadCommand.php
index ab3bce12d2..fb0855b792 100644
--- a/issue-bot/src/Console/DownloadCommand.php
+++ b/issue-bot/src/Console/DownloadCommand.php
@@ -96,12 +96,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		}
 
 		$matrix = [];
-		foreach ([70200, 70300, 70400, 80000, 80100, 80200, 80300, 80400] as $phpVersion) {
+		foreach ([70300, 70400, 80000, 80100, 80200, 80300, 80400] as $phpVersion) {
 			$phpVersionHashes = [];
 			foreach ($cachedResults as $hash => $result) {
 				$resultPhpVersions = array_keys($result->getVersionedErrors());
 				if ($resultPhpVersions === [70400]) {
-					$resultPhpVersions = [70200, 70300, 70400, 80000];
+					$resultPhpVersions = [70300, 70400, 80000];
 				}
 
 				if (!in_array(80100, $resultPhpVersions, true)) {
diff --git a/issue-bot/src/Console/EvaluateCommand.php b/issue-bot/src/Console/EvaluateCommand.php
index 0f8d05a8d8..9836d85bb0 100644
--- a/issue-bot/src/Console/EvaluateCommand.php
+++ b/issue-bot/src/Console/EvaluateCommand.php
@@ -101,7 +101,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$originalPhpVersions = array_keys($originalErrors);
 				$newResult = $newResults[$hash];
 				if (array_key_exists(70100, $originalErrors) || $originalPhpVersions === [70400]) {
-					$newResult[70100] = $newResult[70200];
+					$newResult[70100] = $newResult[70300];
+				}
+				if (array_key_exists(70200, $originalErrors)) {
+					$newResult[70200] = $newResult[70300];
 				}
 
 				$newTabs = $this->tabCreator->create($this->filterErrors($originalErrors, $newResult));