diff --git a/docs/pages/resources/changelog.md b/docs/pages/resources/changelog.md
index 559e63f7..0c6492d7 100644
--- a/docs/pages/resources/changelog.md
+++ b/docs/pages/resources/changelog.md
@@ -14,6 +14,7 @@ New versions of Shoelace are released as-needed and generally occur when a criti
 
 ## Next
 
+- Fixed a bug in the autoloader causing it to register non-Shoelace elements [#1563]
 - Fixed a bug in `<sl-switch>` that resulted in improper spacing between the label and the required asterisk [#1540]
 - Updated `@ctrl/tinycolor` to 4.0.1 [#1542]
 - Updated Bootstrap Icons to 1.11.0
diff --git a/src/shoelace-autoloader.ts b/src/shoelace-autoloader.ts
index 2f49515d..4b42c452 100644
--- a/src/shoelace-autoloader.ts
+++ b/src/shoelace-autoloader.ts
@@ -20,7 +20,7 @@ export async function discover(root: Element | ShadowRoot) {
     .map(el => el.tagName.toLowerCase())
     .filter(tag => tag.startsWith('sl-'));
 
-  // If the root element is an undefined shoelace custom element, add it to the list
+  // If the root element is an undefined Shoelace component, add it to the list
   if (rootIsShoelaceElement && !customElements.get(rootTagName)) {
     tags.push(rootTagName);
   }