diff --git a/Resources/config/dbal.xml b/Resources/config/dbal.xml
index af3a92efb..d8fd62287 100644
--- a/Resources/config/dbal.xml
+++ b/Resources/config/dbal.xml
@@ -7,7 +7,6 @@
     <parameters>
         <parameter key="doctrine.dbal.logger.chain.class">Doctrine\DBAL\Logging\LoggerChain</parameter>
         <parameter key="doctrine.dbal.logger.profiling.class">Doctrine\DBAL\Logging\DebugStack</parameter>
-        <parameter key="doctrine.dbal.logger.backtrace.class">Doctrine\DBAL\Logging\BacktraceLogger</parameter>
         <parameter key="doctrine.dbal.logger.class">Symfony\Bridge\Doctrine\Logger\DbalLogger</parameter>
         <parameter key="doctrine.dbal.configuration.class">Doctrine\DBAL\Configuration</parameter>
         <parameter key="doctrine.data_collector.class">Doctrine\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector</parameter>
@@ -31,7 +30,7 @@
         </service>
 
         <service id="doctrine.dbal.logger.profiling" class="%doctrine.dbal.logger.profiling.class%" public="false" abstract="true" />
-        <service id="doctrine.dbal.logger.backtrace" class="%doctrine.dbal.logger.backtrace.class%" public="false" abstract="true" />
+        <service id="doctrine.dbal.logger.backtrace" class="Doctrine\DBAL\Logging\BacktraceLogger" public="false" abstract="true" />
 
         <service id="doctrine.dbal.logger" class="%doctrine.dbal.logger.class%" public="false">
             <tag name="monolog.logger" channel="doctrine" />
diff --git a/Resources/views/Collector/db.html.twig b/Resources/views/Collector/db.html.twig
index 3984c19ca..560180701 100644
--- a/Resources/views/Collector/db.html.twig
+++ b/Resources/views/Collector/db.html.twig
@@ -257,7 +257,7 @@
 
                                     {% if query.backtrace is defined %}
                                         &nbsp;&nbsp;
-                                        <a href="#" class="sf-toggle link-inverse" data-toggle-selector="#backtrace-query-{{ i }}-{{ loop.parent.loop.index }}" data-toggle-alt-content="Hide query backtrace">View query backtrace</a>
+                                        <a href="#" class="sf-toggle link-inverse" data-toggle-selector="#backtrace-{{ i }}-{{ loop.parent.loop.index }}" data-toggle-alt-content="Hide query backtrace">View query backtrace</a>
                                     {% endif %}
                                 </div>
 
@@ -274,10 +274,10 @@
                                 {% endif %}
 
                                 {% if query.backtrace is defined %}
-                                    <div id="backtrace-query-{{ i }}-{{ loop.parent.loop.index }}" class="hidden">
+                                    <div id="backtrace-{{ i }}-{{ loop.parent.loop.index }}" class="hidden">
                                         <table>
                                             <thead>
-                                                <tr >
+                                                <tr>
                                                     <th scope="col">#</th>
                                                     <th scope="col">File/Call</th>
                                                 </tr>
@@ -292,8 +292,12 @@
                                                                 {% set file_path = trace.file|format_file(line_number)|striptags|replace({ (' at line ' ~ line_number): '' }) %}
                                                                 {% set file_path_parts = file_path|split(constant('DIRECTORY_SEPARATOR')) %}
 
-                                                                {{ file_path_parts[:-1]|join(constant('DIRECTORY_SEPARATOR')) }}{{ constant('DIRECTORY_SEPARATOR') }}<strong>{{ file_path_parts|last }}</strong>
-                                                                {{- trace.type }}<span class="status-warning">{{ trace.function }}</span> (line {{ line_number }})
+                                                                {{- file_path_parts[:-1]|join(constant('DIRECTORY_SEPARATOR')) -}}
+                                                                {{- constant('DIRECTORY_SEPARATOR') -}}
+                                                                <strong>{{ file_path_parts|last }}</strong>
+                                                                {{- trace.type ?? '::' -}}
+                                                                <span class="status-warning">{{ trace.function }}</span>
+                                                                (line {{ line_number }})
                                                             </span>
                                                         </td>
                                                     </tr>