diff --git a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php
index 1a4136ee18..d9994d6903 100644
--- a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php
+++ b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php
@@ -36,8 +36,6 @@ final class AddPrefixTableController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $selected = $_POST['selected'] ?? [];
 
         $GLOBALS['sql_query'] = '';
@@ -55,10 +53,6 @@ final class AddPrefixTableController extends AbstractController
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         ($this->structureController)($request);
     }
 }
diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableController.php b/libraries/classes/Controllers/Database/Structure/CopyTableController.php
index 6844c70305..e08adf36dc 100644
--- a/libraries/classes/Controllers/Database/Structure/CopyTableController.php
+++ b/libraries/classes/Controllers/Database/Structure/CopyTableController.php
@@ -36,8 +36,6 @@ final class CopyTableController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $selected = $_POST['selected'] ?? [];
         $targetDb = $_POST['target_db'] ?? null;
         $selectedCount = count($selected);
@@ -63,10 +61,6 @@ final class CopyTableController extends AbstractController
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         ($this->structureController)($request);
     }
 }
diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php
index e34e74b944..ecb077af17 100644
--- a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php
+++ b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php
@@ -32,8 +32,6 @@ final class CopyTableWithPrefixController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $selected = $_POST['selected'] ?? [];
         $fromPrefix = $_POST['from_prefix'] ?? null;
         $toPrefix = $_POST['to_prefix'] ?? null;
@@ -58,10 +56,6 @@ final class CopyTableWithPrefixController extends AbstractController
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         ($this->structureController)($request);
     }
 }
diff --git a/libraries/classes/Controllers/Database/Structure/DropTableController.php b/libraries/classes/Controllers/Database/Structure/DropTableController.php
index 591503ae91..e4e56834bc 100644
--- a/libraries/classes/Controllers/Database/Structure/DropTableController.php
+++ b/libraries/classes/Controllers/Database/Structure/DropTableController.php
@@ -45,8 +45,6 @@ final class DropTableController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $GLOBALS['reload'] = $_POST['reload'] ?? $GLOBALS['reload'] ?? null;
         $multBtn = $_POST['mult_btn'] ?? '';
         $selected = $_POST['selected'] ?? [];
@@ -56,10 +54,6 @@ final class DropTableController extends AbstractController
         if ($multBtn !== __('Yes')) {
             $GLOBALS['message'] = Message::success(__('No change'));
 
-            if (empty($_POST['message'])) {
-                $_POST['message'] = Message::success();
-            }
-
             unset($_POST['mult_btn']);
 
             ($this->structureController)($request);
@@ -121,10 +115,6 @@ final class DropTableController extends AbstractController
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         unset($_POST['mult_btn']);
 
         ($this->structureController)($request);
diff --git a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php
index 0674cf963f..c54533ea97 100644
--- a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php
+++ b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php
@@ -64,8 +64,6 @@ final class EmptyTableController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $multBtn = $_POST['mult_btn'] ?? '';
         $selected = $_POST['selected'] ?? [];
 
@@ -107,10 +105,6 @@ final class EmptyTableController extends AbstractController
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         unset($_POST['mult_btn']);
 
         ($this->structureController)($request);
diff --git a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php
index 6ea8e1dcbc..816207b9d6 100644
--- a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php
+++ b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php
@@ -38,8 +38,6 @@ final class ReplacePrefixController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $selected = $_POST['selected'] ?? [];
         $fromPrefix = $_POST['from_prefix'] ?? '';
         $toPrefix = $_POST['to_prefix'] ?? '';
@@ -67,10 +65,6 @@ final class ReplacePrefixController extends AbstractController
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         ($this->structureController)($request);
     }
 }