diff --git a/ChangeLog b/ChangeLog
index a0cb3869e8..03ea233d85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
 - issue #12120 PMA_Util not found in insert_edit.lib.php
 - issue #12118 Fixed activation of some languages
 - issue #12121 Fixed error in 3NF step of normalization
+- issue #12135 Fix offering JSON datatype in incompatible MySQL versions
 
 4.6.0.0 (2016-03-22)
 + issue #11456 Disabled storage engines
diff --git a/libraries/TypesMySQL.php b/libraries/TypesMySQL.php
index 86489363b3..a1ee7bacb3 100644
--- a/libraries/TypesMySQL.php
+++ b/libraries/TypesMySQL.php
@@ -535,9 +535,13 @@ class TypesMySQL extends Types
             'GEOMETRYCOLLECTION',
         );
 
-        $ret['JSON'] = array(
-            'JSON',
-        );
+        if (PMA_MYSQL_INT_VERSION >= 50708
+            && \PMA\libraries\Util::getServerType() != 'MariaDB'
+        ) {
+          $ret['JSON'] = array(
+              'JSON',
+          );
+        }
 
         return $ret;
     }