diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index f155b6fe2..677eac5ea 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -375,7 +375,7 @@ function PMA_exportDBCreate($db)
         $result = PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);
     }
 
-    if ($result && isset($GLOBALS['sql_structure']) && isset($GLOBALS['sql_procedure_function'])) {
+    if ($result && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
         $text = '';
         $delimiter = '$$';