diff --git a/libraries/classes/Query/Compatibility.php b/libraries/classes/Query/Compatibility.php
index b671029222..5b80d52894 100644
--- a/libraries/classes/Query/Compatibility.php
+++ b/libraries/classes/Query/Compatibility.php
@@ -207,6 +207,7 @@ class Compatibility
      */
     public static function isUUIDSupported(DatabaseInterface $dbi): bool
     {
+        // @see: https://mariadb.com/kb/en/mariadb-1070-release-notes/#uuid
         return $dbi->isMariaDB() && $dbi->getVersion() >= 100700; // 10.7.0
     }
 
diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php
index ab15d7a7ed..1ebc27930c 100644
--- a/libraries/classes/Types.php
+++ b/libraries/classes/Types.php
@@ -529,7 +529,6 @@ class Types
     {
         $isMariaDB = $this->dbi->isMariaDB();
         $serverVersion = $this->dbi->getVersion();
-        $isUUIDSupported = Compatibility::isUUIDSupported($this->dbi);
 
         switch ($class) {
             case 'CHAR':
@@ -574,10 +573,6 @@ class Types
                     $ret = array_diff($ret, ['INET6_NTOA']);
                 }
 
-                if (! $isUUIDSupported) {
-                    $ret = array_diff($ret, ['UUID']);
-                }
-
                 return array_values($ret);
 
             case 'DATE':
@@ -659,10 +654,6 @@ class Types
                     $ret = array_diff($ret, ['INET6_ATON']);
                 }
 
-                if (! $isUUIDSupported) {
-                    $ret = array_diff($ret, ['UUID_SHORT']);
-                }
-
                 return array_values($ret);
 
             case 'SPATIAL':