diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d1842151..bc51508f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -75,7 +75,7 @@ def redirect_back_with_referer_params(fallback_location:)
 
   def render_flash(type: :success, message: "")
     flash[type] = message unless message.blank?
-    turbo_stream.update "turbo-flash", partial: "shared/flash"
+    turbo_stream.replace "turbo-flash", partial: "shared/flash"
   end
 
   private
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index d53b090c..18340b6f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,9 +2,7 @@
   <%= turbo_stream_from "media_sync" %>
 
   <% if native_app? %>
-    <div id='turbo-flash' class='c-flash'>
-      <%= render "shared/flash" %>
-    </div>
+    <%= render "shared/flash" %>
     <main class='u-p-large u-p-small@small'>
       <%= yield %>
     </main>
@@ -23,9 +21,7 @@
       <div id='js-app' class='o-flex__item o-flex__item--grow-1'>
         <div>
           <header class='c-nav c-nav--primary u-position-sticky-top'>
-            <div id='turbo-flash' class='c-flash'>
-              <%= render "shared/flash" %>
-            </div>
+            <%= render "shared/flash" %>
             <%= render "shared/search_bar" %>
             <%= render "shared/nav_bar" %>
           </header>
diff --git a/app/views/layouts/plain.html.erb b/app/views/layouts/plain.html.erb
index dcb115d1..06c1a6b6 100644
--- a/app/views/layouts/plain.html.erb
+++ b/app/views/layouts/plain.html.erb
@@ -1,7 +1,5 @@
 <% content_for :body do %>
-  <div id='turbo-flash' class='c-flash'>
-    <%= render "shared/flash" %>
-  </div>
+  <%= render "shared/flash" %>
   <div class='o-flex o-flex--justify-center o-flex--align-center u-vh-100 u-bg-gradient'>
     <div class='o-container o-container--extra-narrow  u-w-100 u-mx-small u-bg-primary u-px-small u-py-large u-border-shadow u-border-radius-large'>
       <div class='u-mb-large u-text-align-center'>
diff --git a/app/views/shared/_flash.html.erb b/app/views/shared/_flash.html.erb
index 017a0c27..9afcee47 100644
--- a/app/views/shared/_flash.html.erb
+++ b/app/views/shared/_flash.html.erb
@@ -1,4 +1,4 @@
-<div class='<%= "u-display-none" if native_app? %>'>
+<div id='turbo-flash' data-turbo-temporary class='c-flash <%= "u-display-none" if native_app? %>'>
   <% flash.each do |key, value| %>
     <div class='o-animation-fadeInDown c-flash__body <%= "c-flash__body--#{key}" %>' data-controller='flash flash-bridge'>
       <%= h value %>