diff --git a/ChangeLog b/ChangeLog
index 8b5f03b9f..8b4586ac3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   is mysqlnd
 
 2.11.3.0 (not yet released)
+- patch #1818389 to remove a notice (failed to flush buffer), thanks to
+  Bertrand
 
 2.11.2.0 (2007-10-27)
 - patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard
diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php
index 3490d4e2b..0c970f830 100644
--- a/libraries/ob.lib.php
+++ b/libraries/ob.lib.php
@@ -97,7 +97,7 @@ function PMA_outBufferPre()
  */
 function PMA_outBufferPost()
 {
-    if (PMA_outBufferModeGet()) {
+    if (ob_get_status() && PMA_outBufferModeGet()) {
         ob_flush();
     } else {
         flush();