diff --git a/modules/helpdesk/pages/helpdesk/debitor(default).phtml b/modules/helpdesk/pages/helpdesk/debitor(default).phtml
index 25b2109..8080390 100644
--- a/modules/helpdesk/pages/helpdesk/debitor(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/debitor(default).phtml
@@ -60,8 +60,6 @@ $searchConfig = is_array($searchConfig ?? null) ? $searchConfig : null;
     require templatePath('partials/app-details-titlebar.phtml');
     ?>
 
-    <?php require templatePath('partials/app-flash.phtml'); ?>
-
     <?php if ($hasError): ?>
       <div class="notice" data-variant="error" role="alert">
         <p><?php e(t('Could not connect to Business Central.')); ?></p>
diff --git a/modules/helpdesk/pages/helpdesk/domain(default).phtml b/modules/helpdesk/pages/helpdesk/domain(default).phtml
index e921ad8..19ced9d 100644
--- a/modules/helpdesk/pages/helpdesk/domain(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/domain(default).phtml
@@ -61,8 +61,6 @@ $stateVariant = $stateVariantMap[$domainState] ?? 'neutral';
     require templatePath('partials/app-details-titlebar.phtml');
     ?>
 
-    <?php require templatePath('partials/app-flash.phtml'); ?>
-
     <?php if ($hasError): ?>
       <div class="notice" data-variant="error" role="alert">
         <p><?php e(t('Could not connect to Business Central.')); ?></p>
diff --git a/modules/helpdesk/pages/helpdesk/domains/index(default).phtml b/modules/helpdesk/pages/helpdesk/domains/index(default).phtml
index cadf780..a9038b1 100644
--- a/modules/helpdesk/pages/helpdesk/domains/index(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/domains/index(default).phtml
@@ -9,8 +9,6 @@ $searchConfig = is_array($searchConfig ?? null) ? $searchConfig : null;
 $filterChipMeta = is_array($filterChipMeta ?? null) ? $filterChipMeta : [];
 $isConfigured = $isConfigured ?? false;
 ?>
-<?php require templatePath('partials/app-flash.phtml'); ?>
-
 <?php if (!$isConfigured): ?>
   <div class="notice" data-variant="warning" role="alert">
     <p><?php e(t('BC connection is not configured. Please configure the connection in the settings.')); ?></p>
diff --git a/modules/helpdesk/pages/helpdesk/handovers/create(default).phtml b/modules/helpdesk/pages/helpdesk/handovers/create(default).phtml
index d327899..9de04b9 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/create(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/handovers/create(default).phtml
@@ -16,8 +16,6 @@ $steps = [
     ['label' => t('Protocol'), 'number' => 2],
 ];
 ?>
-<?php require templatePath('partials/app-flash.phtml'); ?>
-
 <div class="app-wizard-content">
   <div class="app-wizard-header">
     <a href="<?php e(lurl($closeTarget)); ?>" class="app-wizard-back" data-tooltip="<?php e(t('Back to list')); ?>">
diff --git a/modules/helpdesk/pages/helpdesk/handovers/edit(default).phtml b/modules/helpdesk/pages/helpdesk/handovers/edit(default).phtml
index 3f5647e..58102a3 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/edit(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/handovers/edit(default).phtml
@@ -26,8 +26,6 @@ $editBasePath = $editBasePath ?? ('helpdesk/handovers/edit/' . ($handover['id']
 ?>
 <div class="app-details-container">
   <section>
-    <?php require templatePath('partials/app-flash.phtml'); ?>
-
     <?php
     $titlebar = [
         'title' => $titleText ?? t('Handover'),
diff --git a/modules/helpdesk/pages/helpdesk/handovers/index(default).phtml b/modules/helpdesk/pages/helpdesk/handovers/index(default).phtml
index 0d15471..4d7462d 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/index(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/handovers/index(default).phtml
@@ -10,8 +10,6 @@ $filterChipMeta = is_array($filterChipMeta ?? null) ? $filterChipMeta : [];
 $canCreate = $canCreate ?? false;
 $canManage = $canManage ?? false;
 ?>
-<?php require templatePath('partials/app-flash.phtml'); ?>
-
 <?php
 $listTitle = t('Handovers');
 ob_start();
diff --git a/modules/helpdesk/pages/helpdesk/index(default).phtml b/modules/helpdesk/pages/helpdesk/index(default).phtml
index e7e6cb0..d4a951d 100644
--- a/modules/helpdesk/pages/helpdesk/index(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/index(default).phtml
@@ -9,8 +9,6 @@ $searchConfig = is_array($searchConfig ?? null) ? $searchConfig : null;
 $filterChipMeta = is_array($filterChipMeta ?? null) ? $filterChipMeta : [];
 $isConfigured = $isConfigured ?? false;
 ?>
-<?php require templatePath('partials/app-flash.phtml'); ?>
-
 <?php if (!$isConfigured): ?>
   <div class="notice" data-variant="warning" role="alert">
     <p><?php e(t('BC connection is not configured. Please configure the connection in the settings.')); ?></p>
diff --git a/modules/helpdesk/pages/helpdesk/risk-radar/index(default).phtml b/modules/helpdesk/pages/helpdesk/risk-radar/index(default).phtml
index 5dbd277..df0ec22 100644
--- a/modules/helpdesk/pages/helpdesk/risk-radar/index(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/risk-radar/index(default).phtml
@@ -55,7 +55,6 @@ $periodLabels = [
         ],
     ];
     require templatePath('partials/app-details-titlebar.phtml');
-    require templatePath('partials/app-flash.phtml');
     ?>
 
     <div class="helpdesk-risk-radar-dashboard">
diff --git a/modules/helpdesk/pages/helpdesk/settings/index(default).phtml b/modules/helpdesk/pages/helpdesk/settings/index(default).phtml
index 3a6ff57..a9bc8cb 100644
--- a/modules/helpdesk/pages/helpdesk/settings/index(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/settings/index(default).phtml
@@ -91,7 +91,6 @@ $tenantIsOAuth2 = $tenantAuthMode === HelpdeskSettingsGateway::AUTH_MODE_OAUTH2;
         ],
     ];
     require templatePath('partials/app-details-titlebar.phtml');
-    require templatePath('partials/app-flash.phtml');
     ?>
 
     <?php if ($configErrors !== []): ?>
diff --git a/modules/helpdesk/pages/helpdesk/software-products/edit(default).phtml b/modules/helpdesk/pages/helpdesk/software-products/edit(default).phtml
index 3293e2c..83b41cd 100644
--- a/modules/helpdesk/pages/helpdesk/software-products/edit(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/software-products/edit(default).phtml
@@ -11,8 +11,6 @@ $active = (int) ($values['active'] ?? 1);
 ?>
 <div class="app-details-container">
   <section>
-    <?php require templatePath('partials/app-flash.phtml'); ?>
-
     <?php
     $titlebar = [
         'title' => $titleText ?? t('Edit software product'),
diff --git a/modules/helpdesk/pages/helpdesk/software-products/index(default).phtml b/modules/helpdesk/pages/helpdesk/software-products/index(default).phtml
index f4f37ce..c34457e 100644
--- a/modules/helpdesk/pages/helpdesk/software-products/index(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/software-products/index(default).phtml
@@ -9,8 +9,6 @@ $searchConfig = is_array($searchConfig ?? null) ? $searchConfig : null;
 $filterChipMeta = is_array($filterChipMeta ?? null) ? $filterChipMeta : [];
 $isConfigured = $isConfigured ?? false;
 ?>
-<?php require templatePath('partials/app-flash.phtml'); ?>
-
 <?php if (!$isConfigured): ?>
   <div class="notice" data-variant="warning" role="alert">
     <p><?php e(t('BC connection is not configured. Please configure the connection in the settings.')); ?></p>
diff --git a/modules/helpdesk/pages/helpdesk/team/index(default).phtml b/modules/helpdesk/pages/helpdesk/team/index(default).phtml
index 47035d8..b696d8e 100644
--- a/modules/helpdesk/pages/helpdesk/team/index(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/team/index(default).phtml
@@ -51,7 +51,6 @@ $periodLabels = [
         ],
     ];
     require templatePath('partials/app-details-titlebar.phtml');
-    require templatePath('partials/app-flash.phtml');
     ?>
 
     <div class="helpdesk-team-dashboard">
diff --git a/modules/helpdesk/pages/helpdesk/ticket(default).phtml b/modules/helpdesk/pages/helpdesk/ticket(default).phtml
index b811fde..5ff88dd 100644
--- a/modules/helpdesk/pages/helpdesk/ticket(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/ticket(default).phtml
@@ -34,5 +34,4 @@ $titlebar = [
     ] : [],
 ];
 require templatePath('partials/app-details-titlebar.phtml');
-require templatePath('partials/app-flash.phtml');
 require __DIR__ . '/../../templates/helpdesk-ticket-detail.phtml';
diff --git a/modules/helpdesk/pages/helpdesk/updates/index(default).phtml b/modules/helpdesk/pages/helpdesk/updates/index(default).phtml
index 63ead88..20999b5 100644
--- a/modules/helpdesk/pages/helpdesk/updates/index(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/updates/index(default).phtml
@@ -9,8 +9,6 @@ $searchConfig = is_array($searchConfig ?? null) ? $searchConfig : null;
 $filterChipMeta = is_array($filterChipMeta ?? null) ? $filterChipMeta : [];
 $canManage = $canManage ?? false;
 ?>
-<?php require templatePath('partials/app-flash.phtml'); ?>
-
 <?php
 $listTitle = t('Updates');
 ob_start();