diff --git a/export.php b/export.php
index 54ad70ddd2..065c0fbbd3 100644
--- a/export.php
+++ b/export.php
@@ -6,10 +6,17 @@
  * @package PhpMyAdmin
  */
 
+/**
+ * If we are sending the export file (as opposed to just displaying it
+ * as text), we have to bypass the usual PMA_Response mechanism 
+ */
+if ($_POST['output_format'] == 'sendit') {
+    define('PMA_BYPASS_GET_INSTANCE', 1);
+}
+
 /**
  * Get the variables sent or posted to this script and a core script
  */
-define('PMA_BYPASS_GET_INSTANCE', 1);
 require_once 'libraries/common.inc.php';
 require_once 'libraries/zip.lib.php';
 require_once 'libraries/plugin_interface.lib.php';