diff --git a/CHANGES.md b/CHANGES.md
index 75f4b1b36..d4ab8aaee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ Soon we'll deprecate the latter, so prepare now.
 - #2187: Avoid merging initial settings with themselves every time settings are extended.
 - #2199: Fix BOSH session restore.
 - #2201: added html to converse.env
+- #2213: added CustomElement to converse.env
 - Removed the mockups from the project. Recommended to use tests instead.
 - The API method `api.settings.update` has been deprecated in favor of `api.settings.extend`.
 - Filter roster contacts via all available information (JID, nickname and VCard full name).
diff --git a/src/headless/converse-core.js b/src/headless/converse-core.js
index d011a5ff6..a7195c984 100644
--- a/src/headless/converse-core.js
+++ b/src/headless/converse-core.js
@@ -20,6 +20,7 @@ import { Collection } from "@converse/skeletor/src/collection";
 import { Events } from '@converse/skeletor/src/events.js';
 import { Model } from '@converse/skeletor/src/model.js';
 import { Router } from '@converse/skeletor/src/router.js';
+import { CustomElement } from '../components/element';
 import { __, i18n } from './i18n';
 import { assignIn, debounce, invoke, isFunction, isObject, isString, pick } from 'lodash-es';
 import { html } from 'lit-element';
@@ -1634,7 +1635,7 @@ Object.assign(converse, {
      * @property {function} converse.env.sizzle    - [Sizzle](https://sizzlejs.com) CSS selector engine.
      * @property {object} converse.env.utils       - Module containing common utility methods used by Converse.
      */
-    'env': { $build, $iq, $msg, $pres, Model, Collection, Promise, Strophe, _, dayjs, log, sizzle, stanza_utils, u, 'utils': u, html }
+    'env': { $build, $iq, $msg, $pres, Model, Collection, CustomElement, Promise, Strophe, _, dayjs, log, sizzle, stanza_utils, u, 'utils': u, html }
 });
 
 /**