diff --git a/pandora_console/godmode/servers/discovery.php b/pandora_console/godmode/servers/discovery.php
index 261cdd0696..d7ee26de86 100755
--- a/pandora_console/godmode/servers/discovery.php
+++ b/pandora_console/godmode/servers/discovery.php
@@ -134,7 +134,10 @@ if ($classname_selected !== null) {
             ui_print_error_message($result['msg']);
         }
 
-        $classname_selected = null;
+        // Redirect to Tasklist.
+        $classname_selected = 'DiscoveryTaskList';
+        $wiz = new $classname_selected($page);
+        $result = $wiz->run();
     }
 }
 
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index e075bb4f9e..179d87b2a6 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -125,17 +125,23 @@ class DiscoveryTaskList extends Wizard
         $task = get_parameter('task', null);
 
         if ($task !== null) {
-            db_process_sql_delete(
+            $result = db_process_sql_delete(
                 'trecon_task',
                 ['id_rt' => $task]
             );
+
+            if ($result == 1) {
+                return [
+                    'result' => 0,
+                    'msg'    => __('Task successfully deleted'),
+                    'id'     => false,
+                ];
+            }
+
+            // Trick to avoid double execution.
+            header('Location: '.$this->url);
         }
 
-        return [
-            'result' => 0,
-            'msg'    => __('Task successfully deleted'),
-            'id'     => false,
-        ];
     }