diff --git a/CHANGES.md b/CHANGES.md
index 11ede622e..80bcb48ec 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@
 - #1761: Add a new dark theme based on the [Dracula](https://draculatheme.com/) theme
 - #2751: Media not rendered when Converse runs in a browser extension
 - #2786: Fix webpack configuration not working on Windows OS
+- #2788: `TypeError` when trying to use `@converse/headless`
 - #2789: Implement new hook `parseMessageForCommands` for plugins to add custom commands
 
 
diff --git a/src/headless/core.js b/src/headless/core.js
index 36395d361..b6a5a0507 100644
--- a/src/headless/core.js
+++ b/src/headless/core.js
@@ -740,7 +740,9 @@ Object.assign(converse, {
         initPlugins(_converse);
 
         // Register all custom elements
-        api.elements.register();
+        // XXX: api.elements is defined in the UI part of Converse, outside of @converse/headless.
+        // This line should probably be moved to the UI code as part of a larger refactoring.
+        api.elements?.register();
 
         registerGlobalEventHandlers(_converse);