diff --git a/administrator/components/com_admin/src/Model/SysinfoModel.php b/administrator/components/com_admin/src/Model/SysinfoModel.php
index 33365916235e2..e7dd99a5ea88f 100644
--- a/administrator/components/com_admin/src/Model/SysinfoModel.php
+++ b/administrator/components/com_admin/src/Model/SysinfoModel.php
@@ -310,16 +310,19 @@ public function &getInfo(): array
             return $this->info;
         }
 
-        $db = $this->getDatabase();
+        $db     = $this->getDatabase();
+        $dbType = $db->getServerType();
 
         $this->info = [
             'php'                    => php_uname(),
-            'dbserver'               => $db->getServerType(),
+            'dbserver'               => $dbType,
             'dbversion'              => $db->getVersion(),
             'dbcollation'            => $db->getCollation(),
             'dbconnectioncollation'  => $db->getConnectionCollation(),
             'dbconnectionencryption' => $db->getConnectionEncryption(),
             'dbconnencryptsupported' => $db->isConnectionEncryptionSupported(),
+            'dbsqlbigselects'        => $dbType === 'mysql' ? $db->getSessionVarBool('sql_big_selects') : null,
+            'dbmaxjoinsize'          => $dbType === 'mysql' ? $db->getSessionVarString('max_join_size') : null,
             'phpversion'             => PHP_VERSION,
             'server'                 => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
             'sapi_name'              => PHP_SAPI,
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_system.php b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
index 06e1bdb41f60a..186d04bf6fd6a 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_system.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
@@ -88,6 +88,26 @@
                     <?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
                 </td>
             </tr>
+            <?php if ($this->info['dbsqlbigselects'] !== null) : ?>
+            <tr>
+                <th scope="row">
+                    <?php echo Text::_('COM_ADMIN_DATABASE_SQL_BIG_SELECTS'); ?>
+                </th>
+                <td>
+                    <?php echo $this->info['dbsqlbigselects'] ? Text::_('JON') : Text::_('JOFF'); ?>
+                </td>
+            </tr>
+            <?php endif; ?>
+            <?php if ($this->info['dbmaxjoinsize'] !== null) : ?>
+            <tr>
+                <th scope="row">
+                    <?php echo Text::_('COM_ADMIN_DATABASE_MAX_JOIN_SIZE'); ?>
+                </th>
+                <td>
+                    <?php echo $this->info['dbmaxjoinsize']; ?>
+                </td>
+            </tr>
+            <?php endif; ?>
             <tr>
                 <th scope="row">
                     <?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
diff --git a/administrator/language/en-GB/com_admin.ini b/administrator/language/en-GB/com_admin.ini
index ce7445a14db71..22f669e2250fd 100644
--- a/administrator/language/en-GB/com_admin.ini
+++ b/administrator/language/en-GB/com_admin.ini
@@ -11,6 +11,8 @@ COM_ADMIN_DATABASE_COLLATION="Database Collation"
 COM_ADMIN_DATABASE_CONNECTION_COLLATION="Database Connection Collation"
 COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION="Database Connection Encryption"
 COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED="Database Server Supports Connection Encryption"
+COM_ADMIN_DATABASE_MAX_JOIN_SIZE="Database \"max_join_size\""
+COM_ADMIN_DATABASE_SQL_BIG_SELECTS="Database \"sql_big_selects\""
 COM_ADMIN_DATABASE_TYPE="Database Type"
 COM_ADMIN_DATABASE_VERSION="Database Version"
 COM_ADMIN_DIRECTORY="Folder"