diff --git a/framework/core/views/email/html/information/base.blade.php b/framework/core/views/email/html/information/base.blade.php
index 0ed9902c16..df71fd2883 100644
--- a/framework/core/views/email/html/information/base.blade.php
+++ b/framework/core/views/email/html/information/base.blade.php
@@ -5,10 +5,12 @@
@endsection
@section('content')
-
{!! $formatter->convert($infoContent) !!}
-
- @yield('contentPreview')
-
+ {!! $formatter->convert($infoContent) !!}
+ @hasSection('contentPreview')
+
+ @yield('contentPreview')
+
+ @endif
@endsection
@section('footer')
diff --git a/framework/core/views/email/html/notification/base.blade.php b/framework/core/views/email/html/notification/base.blade.php
index 0d7bc3d0f0..a62fed0891 100644
--- a/framework/core/views/email/html/notification/base.blade.php
+++ b/framework/core/views/email/html/notification/base.blade.php
@@ -6,9 +6,11 @@
@section('content')
@yield('notificationContent')
-
- @yield('contentPreview')
-
+ @hasSection('contentPreview')
+
+ @yield('contentPreview')
+
+ @endif
@endsection
@section('footer')