diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
index 8ed5226ad5..d42a9dec47 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
@@ -1,4 +1,4 @@
-<div class="exception-summary">
+<div class="exception-summary {{ exception.message is empty ? 'exception-without-message' }}">
     <div class="exception-metadata">
         <div class="container">
             <h2 class="exception-hierarchy">
@@ -13,9 +13,9 @@
             </h2>
         </div>
     </div>
-    {% if exception.message is not empty %}
-    <div class="container">
-        <div class="exception-message-wrapper">
+
+    <div class="exception-message-wrapper">
+        <div class="container">
             <h1 class="break-long-words exception-message {{ exception.message|length > 180 ? 'long' }}">
                 {{- exception.message|nl2br|format_file_from_text -}}
             </h1>
@@ -25,7 +25,6 @@
             </div>
         </div>
     </div>
-    {% endif %}
 </div>
 
 <div class="container">
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
index ba3dd9412e..9d03015f2f 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
@@ -79,7 +79,8 @@ header .container { display: flex; justify-content: space-between; }
 .exception-hierarchy .icon { margin: 0 3px; opacity: .7; }
 .exception-hierarchy .icon svg { height: 13px; width: 13px; vertical-align: -2px; }
 
-.exception-message-wrapper { display: flex; align-items: flex-start; min-height: 70px; padding: 10px 0 8px; }
+.exception-without-message .exception-message-wrapper { display: none; }
+.exception-message-wrapper .container { display: flex; align-items: flex-start; min-height: 70px; padding: 10px 0 8px; }
 .exception-message { flex-grow: 1; }
 .exception-message, .exception-message a { color: #FFF; font-size: 21px; font-weight: 400; margin: 0; }
 .exception-message.long { font-size: 18px; }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
index 8a64ed5936..c849cb2966 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
@@ -16,6 +16,9 @@
     margin: 1em 0;
     padding: 10px;
 }
+.exception-summary.exception-without-message {
+    display: none;
+}
 
 .exception-message {
     color: #B0413E;
@@ -26,6 +29,6 @@
     display: none;
 }
 
-.exception-message-wrapper {
+.exception-message-wrapper .container {
     min-height: auto;
 }