diff --git a/ChangeLog b/ChangeLog
index cf000ee12..0c8c984a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [data] display all warnings, not only last one
 - typo in fix for bug #1671813
 - bug #1714908 Inserted Row Count is wrong
+- bug #1712570 Deleting last record freezes
 
 2.10.1.0 (2007-04-23)
 =====================
diff --git a/sql.php b/sql.php
index 98d5d557e..a3006e992 100644
--- a/sql.php
+++ b/sql.php
@@ -642,6 +642,10 @@ if ($num_rows < 1 || $is_affected) {
         $active_page = $goto;
         require './' . $goto;
     } else {
+        // avoid a redirect loop when last record was deleted
+        if ('sql.php' == $cfg['DefaultTabTable']) {
+            $goto = str_replace('sql.php','tbl_structure.php',$goto);
+        }
         PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&amp;', '&', $goto) . '&message=' . urlencode($message));
     } // end else
     exit();