diff --git a/packages/common/dbp-common-demo.js b/packages/common/dbp-common-demo.js
index c1c8f0c69515a40591628934647bd62fd51760a3..4e58093a0f163729582a7ac3a30c75b2b6f48d34 100644
--- a/packages/common/dbp-common-demo.js
+++ b/packages/common/dbp-common-demo.js
@@ -13,16 +13,21 @@ export class DbpCommonDemo extends ScopedElementsMixin(LitElement) {
     }
 
     static get scopedElements() {
-        return {
+        let elements = {
             'dbp-icon': Icon,
             'dbp-mini-spinner': MiniSpinner,
             'dbp-spinner': Spinner,
             'dbp-button': Button,
             'dbp-loading-button': LoadingButton,
-            'dbp-auth': customElements.get('dbp-auth'),
             'dbp-inline-notification': InlineNotification,
             'dbp-translated': Translated,
         };
+
+        if (customElements.get('dbp-auth')) {
+            elements['dbp-auth'] = customElements.get('dbp-auth');
+        }
+
+        return elements;
     }
 
     static get properties() {