diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
index 619469e415323..0932ba02a9a9d 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -414,13 +414,13 @@
 
 {% macro form_tree_entry(name, data, expanded) %}
     <li>
-        <div class="tree-inner" data-tab-target-id="{{ data.id }}-details">
+        <div class="tree-inner" {% if data.id is defined %}data-tab-target-id="{{ data.id }}-details"{% endif %}>
             {% if data.children is not empty %}
                 <a class="toggle-button" data-toggle-target-id="{{ data.id }}-children" href="#"><span class="toggle-icon"></span></a>
             {% else %}
                 <div class="toggle-icon empty"></div>
             {% endif %}
-            {{ name|default('(no name)') }} {% if data.type is not empty %}[<abbr title="{{ data.type_class }}">{{ data.type }}</abbr>]{% endif %}
+            {{ name|default('(no name)') }} {% if data.type is defined and data.type is not empty %}[<abbr title="{{ data.type_class }}">{{ data.type }}</abbr>]{% endif %}
             {% if data.errors is defined and data.errors|length > 0 %}
             <div class="badge-error">{{ data.errors|length }}</div>
             {% endif %}
@@ -542,13 +542,13 @@
 
         {% if data.submitted_data is defined %}
         <h3>
-            <a class="toggle-button" data-toggle-target-id="{{ data.id }}-submitted_data" href="#">
+            <a class="toggle-button"{% if data.id is defined %} data-toggle-target-id="{{ data.id }}-submitted_data"{% endif %} href="#">
                 Submitted Data
                 <span class="toggle-icon"></span>
             </a>
         </h3>
 
-        <div id="{{ data.id }}-submitted_data">
+        <div{% if data.id is defined %} id="{{ data.id }}-submitted_data"{% endif %}>
         {% if data.submitted_data.norm is defined %}
             <table>
                 <tr>