diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketActionCommon.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketActionCommon.tt
index 597dfefe26a..4367800cb98 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketActionCommon.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketActionCommon.tt
@@ -277,7 +277,6 @@
                         [% END %]
 
 [% RenderBlockStart("TicketTypeDynamicFields") %]
-                        [% IF !TicketFrontendConfig.DynamicField.empty %]
                         <div class="dynamic-field-col card-item col-wide-100 col-desktop-100 col-tablet-100">
                             <h2 class="card-title">[% Translate("Dynamic Info") | html %]</h2>
 [% RenderBlockStart("TicketTypeDynamicField") %]
@@ -289,7 +288,6 @@
                                 </div>
 [% RenderBlockEnd("TicketTypeDynamicField") %]
                         </div>
-                        [% END %]
 [% RenderBlockEnd("TicketTypeDynamicFields") %]
 
 # Example of how to use fixed dynamic field blocks for customizations. Block below is for fields of type 'Ticket'.
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketCompose.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketCompose.tt
index 987c7abeefb..ba92051020c 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketCompose.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketCompose.tt
@@ -66,7 +66,7 @@
                         </div>
                     </div>
                 </div>
-                [% IF !TicketFrontendConfig.DynamicField.empty %]
+                [% IF Data.DynamicFieldHTML && Data.DynamicFieldHTML.list.size > 0 %]
                 <div class="card-item col-desktop-100 col-wide-100">
                     <h2 class="card-title">[% Translate("Dynamic Info") | html %]</h2>
 [% RenderBlockStart("DynamicField") %]
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmail.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmail.tt
index 8bf805715f1..5c3377cb943 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmail.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmail.tt
@@ -385,7 +385,7 @@
                             </div>
                         </div>
                     </div>
-                    [% IF !Data.DynamicFieldHTML.empty %]
+                    [% IF Data.DynamicFieldHTML && Data.DynamicFieldHTML.list.size > 0 %]
                     <div class="dynamic-field-col card-item col-wide-66 col-desktop-100 col-tablet-100">
                         <h2 class="card-title">[% Translate("Dynamic Info") | html %]</h2>
 [% RenderBlockStart("DynamicField") %]
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailOutbound.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailOutbound.tt
index cb51b75b667..5e1d9587708 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailOutbound.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailOutbound.tt
@@ -309,7 +309,7 @@
                     </div>
                 </div>
 
-                [% IF !TicketFrontendConfig.DynamicField.empty %]
+                [% IF Data.DynamicFieldHTML && Data.DynamicFieldHTML.list.size > 0 %]
                 <div class="dynamic-field-col card-item col-wide-100 col-desktop-100 col-tablet-100">
                     <h2 class="card-title">[% Translate("Dynamic Info") | html %]</h2>
 [% RenderBlockStart("DynamicField") %]
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketForward.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketForward.tt
index e36d9d8efd7..441a3cef7ea 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketForward.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketForward.tt
@@ -62,7 +62,7 @@
                         </div>
                     </div>
                 </div>
-                [% IF !TicketFrontendConfig.DynamicField.empty %]
+                [% IF Data.DynamicFieldHTML && Data.DynamicFieldHTML.list.size > 0 %]
                 <div class="card-item col-desktop-100 col-wide-100">
                     <h2 class="card-title">[% Translate("Dynamic Info") | html %]</h2>
 [% RenderBlockStart("DynamicField") %]
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketNoteToLinkedTicket.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketNoteToLinkedTicket.tt
index a8045515b95..3cc7c0ccea4 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketNoteToLinkedTicket.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketNoteToLinkedTicket.tt
@@ -274,7 +274,6 @@
                         [% END %]
 
 [% RenderBlockStart("TicketTypeDynamicFields") %]
-                        [% IF !TicketFrontendConfig.DynamicField.empty %]
                         <div class="dynamic-field-col card-item col-wide-100 col-desktop-100 col-tablet-100">
                             <h2 class="card-title">[% Translate("Dynamic Info") | html %]</h2>
 [% RenderBlockStart("TicketTypeDynamicField") %]
@@ -286,7 +285,6 @@
                                 </div>
 [% RenderBlockEnd("TicketTypeDynamicField") %]
                         </div>
-                        [% END %]
 [% RenderBlockEnd("TicketTypeDynamicFields") %]
 
 
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketPhone.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketPhone.tt
index bedca213a32..787381b560a 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketPhone.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketPhone.tt
@@ -250,7 +250,7 @@
         </div>
     </div>
 
-[% IF !TicketFrontendConfig.DynamicField.empty %]
+[% IF Data.DynamicFieldHTML && Data.DynamicFieldHTML.list.size > 0 %]
     <div class="dynamic-field-col card-item col-wide-66 col-desktop-100 col-tablet-100">
         <h2 class="card-title">[% Translate("Dynamic Info") | html %]</h2>
 [% RenderBlockStart("DynamicField") %]
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketPhoneCommon.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketPhoneCommon.tt
index 3948dd785e0..dc04ceaab16 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketPhoneCommon.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketPhoneCommon.tt
@@ -79,7 +79,7 @@
                         </div>
                         [% END %]
 
-                        [% IF !TicketFrontendConfig.DynamicField.empty %]
+                        [% IF Data.DynamicFieldHTML && Data.DynamicFieldHTML.list.size > 0 %]
                         <div class="dynamic-field-col card-item col-wide-100 col-desktop-100 col-tablet-100">
                             <h2 class="card-title">[% Translate("Dynamic Info") | html %]</h2>
 [% RenderBlockStart("DynamicField") %]
diff --git a/Kernel/Output/HTML/Templates/Standard/CustomerTicketMessage.tt b/Kernel/Output/HTML/Templates/Standard/CustomerTicketMessage.tt
index b0f659d85dc..fb377115dc7 100644
--- a/Kernel/Output/HTML/Templates/Standard/CustomerTicketMessage.tt
+++ b/Kernel/Output/HTML/Templates/Standard/CustomerTicketMessage.tt
@@ -112,7 +112,7 @@
                         </div>
                     </div>
                     [% END %]
-                    [% IF !TicketFrontendConfig.DynamicField.empty %]
+                    [% IF Data.DynamicFieldHTML && Data.DynamicFieldHTML.list.size > 0 %]
                     <div class="card-item col-wide-100 col-desktop-100 col-tablet-100">
                         <h2 class="card-title">[% Translate("Dymanic Info") | html %]</h2>
                         <div class="active-inner-cols">