diff --git a/ChangeLog b/ChangeLog
index 3926abda4a..9e18b1674d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.0.4.0 (not yet released)
 - bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click
+- bug #3961 Avoid Suhosin warning when in simulation mode
 
 4.0.3.0 (not yet released)
 - bug #3941 Recent tables list always empty
diff --git a/index.php b/index.php
index 96f6969710..012b3926ea 100644
--- a/index.php
+++ b/index.php
@@ -519,6 +519,8 @@ if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE) {
  */
 if ($cfg['SuhosinDisableWarning'] == false
     && @ini_get('suhosin.request.max_value_length')
+    // warn about Suhosin only if its simulation mode is not enabled
+    && @ini_get('suhosin.simulation') == '0'
 ) {
     trigger_error(
         sprintf(