diff --git a/CHANGELOG.md b/CHANGELOG.md
index e445e47..97e514c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
  - Fix #380: Avoid rewriting AccessRule::matchRole (maxxer)
  - Fix #378: Add module attribute 'disableIpLogging' (jkmssoft)
  - Enh #387: Added Persian translation (hadi-aj)
+ - Fix #384: Delete flash messages after consuming (cgsmith)
 
 ## 1.5.1 April 5, 2020
  - Fix #370: Extending view fix (effsoft)
diff --git a/docs/installation/configuration-options.md b/docs/installation/configuration-options.md
index 47016ed..5cc51f8 100644
--- a/docs/installation/configuration-options.md
+++ b/docs/installation/configuration-options.md
@@ -67,8 +67,8 @@ registration process.
 
 #### enableFlashMessages (type: `boolean`, default: `true`)
 
-If `true` views will display flash messages.
- 
+If `true` views will display flash messages. Disable this if you want to handle messages display in your views.
+
 #### enableSwitchIdentities (type: `boolean`, default: `true`)
  
 If `true` allows switching identities for the admin user.
diff --git a/src/User/resources/views/shared/_alert.php b/src/User/resources/views/shared/_alert.php
index 1db7378..9929ad2 100644
--- a/src/User/resources/views/shared/_alert.php
+++ b/src/User/resources/views/shared/_alert.php
@@ -19,7 +19,7 @@ use yii\bootstrap\Alert;
 <?php if ($module->enableFlashMessages): ?>
     <div class="row">
         <div class="col-xs-12">
-            <?php foreach (Yii::$app->session->getAllFlashes() as $type => $message): ?>
+            <?php foreach (Yii::$app->session->getAllFlashes(true) as $type => $message): ?>
                 <?php if (in_array($type, ['success', 'danger', 'warning', 'info'], true)): ?>
                     <?= Alert::widget(
                         [