diff --git a/typo3/sysext/install/Classes/Service/UpgradeWizardsService.php b/typo3/sysext/install/Classes/Service/UpgradeWizardsService.php
index b02f4bb0fff7328e3b165946de28fab93858e2c9..1c8d1d3ea11778743d00c2f19135fa66fccf1dfe 100644
--- a/typo3/sysext/install/Classes/Service/UpgradeWizardsService.php
+++ b/typo3/sysext/install/Classes/Service/UpgradeWizardsService.php
@@ -236,7 +236,7 @@ class UpgradeWizardsService
                 ->setMaxResults(1)
                 ->executeQuery()
                 ->fetchOne();
-            // check if database charset is utf-8, also allows utf8mb4
+            // check if database charset is utf-8, also allows utf8mb3 and utf8mb4
             $charsetOk = strpos($charset, 'utf8') === 0;
         }
         return $charsetOk;
diff --git a/typo3/sysext/install/Classes/SystemEnvironment/DatabaseCheck/Platform/MySql.php b/typo3/sysext/install/Classes/SystemEnvironment/DatabaseCheck/Platform/MySql.php
index c1fd574710707867ea25014a6bdd5cf9ca1f86d2..49a52fd0603c0554c51eff19ad41c79d745146aa 100644
--- a/typo3/sysext/install/Classes/SystemEnvironment/DatabaseCheck/Platform/MySql.php
+++ b/typo3/sysext/install/Classes/SystemEnvironment/DatabaseCheck/Platform/MySql.php
@@ -58,6 +58,7 @@ class MySql extends AbstractPlatform
      */
     protected $databaseCharsetToCheck = [
         'utf8',
+        'utf8mb3',
         'utf8mb4',
     ];
 
@@ -67,6 +68,7 @@ class MySql extends AbstractPlatform
      */
     protected $databaseServerCharsetToCheck = [
         'utf8',
+        'utf8mb3',
         'utf8mb4',
     ];
 
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index 815841b913d32152d4d45c632cf2313549788b72..d4847fef415c4dc06a34cc1adf80693bea9d7894 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -247,7 +247,7 @@ class ConfigurationStatus implements StatusProviderInterface
 
         $severity = ReportStatus::OK;
         $statusValue = $this->getLanguageService()->getLL('status_ok');
-        // also allow utf8mb4
+        // also allow utf8mb3 and utf8mb4
         if (strpos($defaultDatabaseCharset, 'utf8') !== 0) {
             // If the default character set is e.g. latin1, BUT all tables in the system are UTF-8,
             // we assume that TYPO3 has the correct charset for adding tables, and everything is fine
diff --git a/typo3/sysext/reports/Resources/Private/Language/locallang_reports.xlf b/typo3/sysext/reports/Resources/Private/Language/locallang_reports.xlf
index 37bab91cec77a4c629494e6561158e2f1409975d..196077714ee033bc3efb0a2159bb06488663f6ca 100644
--- a/typo3/sysext/reports/Resources/Private/Language/locallang_reports.xlf
+++ b/typo3/sysext/reports/Resources/Private/Language/locallang_reports.xlf
@@ -115,7 +115,7 @@
 				<source>Checking database character set failed, got key "%1$s" instead of "character_set_database"</source>
 			</trans-unit>
 			<trans-unit id="status_MysqlDatabaseCharacterSet_Unsupported" resname="status_MysqlDatabaseCharacterSet_Unsupported">
-				<source>Your default database uses character set "%1$s", but only "utf8" or "utf8mb4" is supported with TYPO3.</source>
+				<source>Your default database uses character set "%1$s", but only "utf8", "utf8mb3" or "utf8mb4" is supported with TYPO3.</source>
 			</trans-unit>
 			<trans-unit id="status_MysqlDatabaseCharacterSet_Ok" resname="status_MysqlDatabaseCharacterSet_Ok">
 				<source>Your default database uses utf-8. All good.</source>