diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig
index 77c32cf0a9..e86b4095cd 100644
--- a/templates/table/structure/display_structure.twig
+++ b/templates/table/structure/display_structure.twig
@@ -144,7 +144,8 @@
         'tbl_is_view': tbl_is_view,
         'db_is_system_schema': db_is_system_schema,
         'table': table,
-        'is_active': is_active
+        'is_active': is_active,
+        'mysql_int_version': mysql_int_version
     } only %}
 </div>
 {% if not tbl_is_view and not db_is_system_schema %}
diff --git a/templates/table/structure/optional_action_links.twig b/templates/table/structure/optional_action_links.twig
index fe7cce13ff..90b5f42617 100644
--- a/templates/table/structure/optional_action_links.twig
+++ b/templates/table/structure/optional_action_links.twig
@@ -1,15 +1,18 @@
 <a href="#" id="printView">{{ Util_getIcon('b_print', 'Print'|trans, true) }}</a>
 {% if not tbl_is_view and not db_is_system_schema %}
-    <a href="sql.php" data-post="{{ url_query|raw }}&amp;session_max_rows=all&amp;sql_query=
-        {{- ('SELECT * FROM ' ~ Util_backquote(table) ~ ' PROCEDURE ANALYSE()')|url_encode -}}
-        " style="margin-right: 0;">
-        {{ Util_getIcon(
-            'b_tblanalyse',
-            'Propose table structure'|trans,
-            true
-        ) }}
-    </a>
-    {{ Util_showMySQLDocu('procedure_analyse') }}
+    {# Only display propose table structure for MySQL < 8.0 #}
+    {% if mysql_int_version < 80000 %}
+        <a href="sql.php" data-post="{{ url_query|raw }}&amp;session_max_rows=all&amp;sql_query=
+            {{- ('SELECT * FROM ' ~ Util_backquote(table) ~ ' PROCEDURE ANALYSE()')|url_encode -}}
+            " style="margin-right: 0;">
+            {{ Util_getIcon(
+                'b_tblanalyse',
+                'Propose table structure'|trans,
+                true
+            ) }}
+        </a>
+        {{ Util_showMySQLDocu('procedure_analyse') }}
+    {% endif %}
     {% if is_active %}
         <a href="tbl_tracking.php{{ url_query|raw }}">
             {{ Util_getIcon('eye', 'Track table'|trans, true) }}