diff --git a/module/admin/control.php b/module/admin/control.php
index 40febca28c..99c5142927 100644
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -408,6 +408,7 @@ class admin extends control
         foreach($tableEngines as $table => $engine)
         {
             if($engine == 'InnoDB') continue;
+            if(strpos(",{$this->session->errorTables},", ",{$table},") !== false) continue;
 
             if(stripos($table, 'searchindex') !== false)
             {
@@ -422,6 +423,7 @@ class admin extends control
 
         if(empty($thisTable))
         {
+            unset($_SESSION['errorTables']);
             $response['result'] = 'finished';
             return print(json_encode($response));
         }
@@ -429,7 +431,7 @@ class admin extends control
         try
         {
             /* Check process this table or not. */
-            $dbProcesses = $this->dao->query("SHOW PROCESSLIST")->fetchAll();
+            $dbProcesses = $this->dbh->query("SHOW PROCESSLIST")->fetchAll();
             foreach($dbProcesses as $dbProcess)
             {
                 if($dbProcess->db != $this->config->db->name) continue;
@@ -448,11 +450,13 @@ class admin extends control
         try
         {
             $sql = "ALTER TABLE `$thisTable` ENGINE='InnoDB'";
-            $this->dao->exec($sql);
+            $this->dbh->exec($sql);
             $response['message'] = sprintf($this->lang->admin->changeSuccess, $thisTable);
         }
         catch(PDOException $e)
         {
+            $this->session->set('errorTables', $this->session->errorTables . ',' . $thisTable);
+
             $response['result']  = 'fail';
             $response['message'] = sprintf($this->lang->admin->changeFail, $thisTable, htmlspecialchars($e->getMessage()));
         }
diff --git a/module/admin/view/tableengine.html.php b/module/admin/view/tableengine.html.php
index 84db4ddfba..aff6b38e6b 100644
--- a/module/admin/view/tableengine.html.php
+++ b/module/admin/view/tableengine.html.php
@@ -38,6 +38,7 @@
 <?php js::set('changingTable', $lang->admin->changingTable);?>
 <?php js::set('hasMyISAM', $lang->admin->engineSummary['hasMyISAM']);?>
 <script>
+var changeFails = 0;
 /**
  * Change all table engines.
  *
@@ -63,7 +64,6 @@ function changeTableEngine()
 {
     var $engineBox = $('#engineBox');
     var link       = createLink('admin', 'ajaxChangeTableEngine');
-    var fails      = 0;
     $.ajax(
     {
         type: "GET",
@@ -75,19 +75,21 @@ function changeTableEngine()
             {
                 $engineBox.append("<div class='text-success'><?php echo $lang->admin->changeFinished?></div>");
                 $engineBox.append("<div class='btn btn-sm'><a href='javascript:location.reload()'><?php echo $lang->refresh;?></a></div>");
-                if(fails == 0) $('#mainContent .main-header h2').html("<?php echo $lang->admin->engineSummary['allInnoDB']?>");
-                if(fails != 0) $('#mainContent .main-header h2').html(hasMyISAM.replace('%s', fails));
+                if(changeFails == 0) $('#mainContent .main-header h2').html("<?php echo $lang->admin->engineSummary['allInnoDB']?>");
+                if(changeFails != 0) $('#mainContent .main-header h2').html(hasMyISAM.replace('%s', changeFails));
             }
             else
             {
                 table = response.thisTable;
                 if($engineBox.find('[data-table=' + table + ']').length == 0) $engineBox.append("<li data-table='" + table + "'>" + changingTable.replace('%s', table) + "</li>");
-                $engineBox.find('[data-table=' + table + ']').html(response.message).addClass('text-success');
+                $engineBox.find('[data-table=' + table + ']').html(response.message);
+                if(response.result == 'success') $engineBox.find('[data-table=' + table + ']').addClass('text-success');
+                if(response.result == 'fail') $engineBox.find('[data-table=' + table + ']').addClass('text-warning');
 
                 nextTable = response.nextTable;
                 if(nextTable && $engineBox.find('[data-table=' + nextTable + ']').length == 0) $engineBox.append("<li data-table='" + nextTable + "'>" + changingTable.replace('%s', nextTable) + "</li>");
 
-                if(response.result == 'fail') fails += 1;
+                if(response.result == 'fail') changeFails += 1;
                 $(document).scrollTop($(document).height());
 
                 changeTableEngine();