diff --git a/templating/matrix_templates/sections.py b/templating/matrix_templates/sections.py
index 81b2bb3c..78aabca7 100644
--- a/templating/matrix_templates/sections.py
+++ b/templating/matrix_templates/sections.py
@@ -136,7 +136,7 @@ class MatrixSections(Sections):
             if not event_name.startswith("m.room.message#m."):
                 continue
             sections.append(template.render(
-                example=examples[event_name], 
+                example=examples[event_name][0],
                 event=schemas[event_name],
                 title_kind=subtitle_title_char
             ))
diff --git a/templating/matrix_templates/units.py b/templating/matrix_templates/units.py
index 5ae117ca..94435c52 100644
--- a/templating/matrix_templates/units.py
+++ b/templating/matrix_templates/units.py
@@ -562,7 +562,7 @@ class MatrixUnits(Units):
                 event_name = filename.split("#")[0]
                 example = json.loads(f.read())
 
-                examples[filename] = examples.get(event_name, [])
+                examples[filename] = examples.get(filename, [])
                 examples[filename].append(example)
                 if filename != event_name:
                     examples[event_name] = examples.get(event_name, [])