diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index da8808724..b68e78bc1 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2085,8 +2085,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
 
         echo '<input type="hidden" name="sql_query"'
             .' value="' . htmlspecialchars($sql_query) . '" />' . "\n";
-        echo '<input type="hidden" name="url_query"'
-            .' value="' . $GLOBALS['url_query'] . '" />' . "\n";
+
+        if (! empty($GLOBALS['url_query'])) {
+            echo '<input type="hidden" name="url_query"'
+                .' value="' . $GLOBALS['url_query'] . '" />' . "\n";
+        }
 
         echo '<input type="hidden" name="clause_is_unique"'
             .' value="' . $clause_is_unique . '" />' . "\n";
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index fe614e7a6..e473192c6 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -245,7 +245,9 @@ if (!empty($submit_mult) && !empty($what)) {
     }
     if ($what == 'row_delete') {
         $_url_params['original_sql_query'] = $original_sql_query;
-        $_url_params['original_url_query'] = $original_url_query;
+        if (! empty($original_url_query)) {
+            $_url_params['original_url_query'] = $original_url_query;
+        }
     }
     ?>
 <form action="<?php echo $action; ?>" method="post">
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 8a9db7a58..d44e808a3 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -113,7 +113,9 @@ if (!empty($submit_mult)) {
             $err_url = 'tbl_row_action.php' . PMA_generate_common_url($GLOBALS['url_params']);
             if (! isset($_REQUEST['mult_btn'])) {
                 $original_sql_query = $sql_query;
-                $original_url_query = $url_query;
+                if (! empty($url_query)) {
+                    $original_url_query = $url_query;
+                }
             }
             require './libraries/mult_submits.inc.php';
             $_url_params = $GLOBALS['url_params'];