diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 735f0fbb06..f41102eed7 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -5224,8 +5224,6 @@
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
     </DeprecatedMethod>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['buffer_message']]]></code>
-      <code><![CDATA[$bufferMessage]]></code>
       <code><![CDATA[$pftext]]></code>
     </MixedAssignment>
     <PossiblyInvalidArgument>
diff --git a/src/Header.php b/src/Header.php
index a03b4b2eb9..f26e26e93e 100644
--- a/src/Header.php
+++ b/src/Header.php
@@ -318,14 +318,7 @@ class Header
         }
 
         if ($message !== '') {
-            if (isset($GLOBALS['buffer_message'])) {
-                $bufferMessage = $GLOBALS['buffer_message'];
-            }
-
             $retval .= Generator::getMessage($message);
-            if (isset($bufferMessage)) {
-                $GLOBALS['buffer_message'] = $bufferMessage;
-            }
         }
 
         return $retval;
diff --git a/src/Sql.php b/src/Sql.php
index 1b5fcc9bd7..aab69e93ef 100644
--- a/src/Sql.php
+++ b/src/Sql.php
@@ -1358,9 +1358,6 @@ class Sql
             $scripts->addFile('makegrid.js');
             $scripts->addFile('sql.js');
             Current::$message = null;
-            //we don't need to buffer the output in getMessage here.
-            //set a global variable and check against it in the function
-            $GLOBALS['buffer_message'] = false;
         }
 
         $previousUpdateQueryHtml = $this->getHtmlForPreviousUpdateQuery(