diff --git a/ChangeLog b/ChangeLog
index b30760c4ef..a015f20880 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #4557 PHP fatal error, undefined function __()
 - bug #4568 Date displayed incorrectly when charting a timeline
 - bug #4571 Database Privileges link does not work
+- bug       makegrid.js: where_clause is undefined
 
 4.2.10.1 (2014-10-21)
 - bug #4562 [security] XSS in debug SQL output
diff --git a/js/makegrid.js b/js/makegrid.js
index 20f671426c..85482ce853 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1102,6 +1102,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $('td.to_be_saved').parents('tr').each(function () {
                 var $tr = $(this);
                 var where_clause = $tr.find('.where_clause').val();
+                if (typeof where_clause === 'undefined') {
+                    where_clause = '';
+                }
                 full_where_clause.push(PMA_urldecode(where_clause));
                 var condition_array = jQuery.parseJSON($tr.find('.condition_array').val());