diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 9b0d6d383..b2b306558 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -24,7 +24,6 @@ def index
# GET /workflows/1.json
def show
authorize @workflow
- @skip_flash_messages_in_header = true # we will handle flash messages in the 'workflows' layout
respond_to do |format|
format.html { render layout: 'workflows' }
format.json
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index c4acc9572..b6c8defe3 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -93,11 +93,9 @@
<% end %>
- <% if !defined? @skip_flash_messages_in_header or !@skip_flash_messages_in_header %>
-
- <%= flash_messages %>
-
- <% end %>
+
+ <%= flash_messages %>
+
<%= render(partial: 'layouts/cookie_banner') if cookie_consent.show_banner? %>
diff --git a/app/views/layouts/workflows.html.erb b/app/views/layouts/workflows.html.erb
index 42b2b5dab..a25072f8c 100644
--- a/app/views/layouts/workflows.html.erb
+++ b/app/views/layouts/workflows.html.erb
@@ -3,14 +3,10 @@
<%= render 'layouts/head' %>
-
+ <%= 'header-notice-present' if TeSS::Config.header_notice&.strip.present? %>>
<%= render :partial=>"layouts/header" %>
-
- <%= flash_messages %>
-
-
<%= render 'common/breadcrumbs' if @breadcrumbs %>