diff --git a/src/Database/Driver/PDOMySqlConcrete5/Driver.php b/src/Database/Driver/PDOMySqlConcrete5/Driver.php
index 05f4d03093..d0534fe693 100644
--- a/src/Database/Driver/PDOMySqlConcrete5/Driver.php
+++ b/src/Database/Driver/PDOMySqlConcrete5/Driver.php
@@ -2,6 +2,7 @@
 namespace Concrete\Core\Database\Driver\PDOMySqlConcrete5;
 
 use Concrete\Core\Database\Connection\PDOConnection;
+use Concrete\Core\Database\Platforms\MySQL80Platform;
 
 /**
  * PDO MySql driver.
@@ -22,6 +23,24 @@ public function connect(array $params, $username = null, $password = null, array
         return $conn;
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @see \Doctrine\DBAL\Driver\AbstractMySQLDriver::createDatabasePlatformForVersion()
+     */
+    public function createDatabasePlatformForVersion($version)
+    {
+        if (false === stripos($version, 'mariadb')) {
+            if (preg_match('/^(\d+)/', $version, $match)) {
+                if ((int) $match[1] >= 8) {
+                    return new MySQL80Platform();
+                }
+            }
+        }
+
+        return parent::createDatabasePlatformForVersion($version);
+    }
+
     /**
      * Constructs the MySql PDO DSN.
      *
diff --git a/src/Database/Platforms/Keywords/MySQL80Keywords.php b/src/Database/Platforms/Keywords/MySQL80Keywords.php
new file mode 100644
index 0000000000..df9e27f838
--- /dev/null
+++ b/src/Database/Platforms/Keywords/MySQL80Keywords.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Concrete\Core\Database\Platforms\Keywords;
+
+use Doctrine\DBAL\Platforms\Keywords\MySQL57Keywords;
+
+/**
+ * Backport of https://github.com/doctrine/dbal/pull/3128.
+ */
+class MySQL80Keywords extends MySQL57Keywords
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @see \Doctrine\DBAL\Platforms\Keywords\MySQL57Keywords::getName()
+     */
+    public function getName()
+    {
+        return 'MySQL80';
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see \Doctrine\DBAL\Platforms\Keywords\MySQL57Keywords::getKeywords()
+     */
+    protected function getKeywords()
+    {
+        $keywords = parent::getKeywords();
+
+        $keywords = array_merge($keywords, [
+            'ADMIN',
+            'CUBE',
+            'CUME_DIST',
+            'DENSE_RANK',
+            'EMPTY',
+            'EXCEPT',
+            'FIRST_VALUE',
+            'FUNCTION',
+            'GROUPING',
+            'GROUPS',
+            'JSON_TABLE',
+            'LAG',
+            'LAST_VALUE',
+            'LEAD',
+            'NTH_VALUE',
+            'NTILE',
+            'OF',
+            'OVER',
+            'PERCENT_RANK',
+            'PERSIST',
+            'PERSIST_ONLY',
+            'RANK',
+            'RECURSIVE',
+            'ROW',
+            'ROWS',
+            'ROW_NUMBER',
+            'SYSTEM',
+            'WINDOW',
+        ]);
+
+        return $keywords;
+    }
+}
diff --git a/src/Database/Platforms/MySQL80Platform.php b/src/Database/Platforms/MySQL80Platform.php
new file mode 100644
index 0000000000..3910568e14
--- /dev/null
+++ b/src/Database/Platforms/MySQL80Platform.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Concrete\Core\Database\Platforms;
+
+use Concrete\Core\Database\Platforms\Keywords\MySQL80Keywords;
+use Doctrine\DBAL\Platforms\MySQL57Platform;
+
+/**
+ * Backport of https://github.com/doctrine/dbal/pull/3128.
+ */
+class MySQL80Platform extends MySQL57Platform
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @see \Doctrine\DBAL\Platforms\MySQL57Platform::getReservedKeywordsClass()
+     */
+    protected function getReservedKeywordsClass()
+    {
+        return MySQL80Keywords::class;
+    }
+}