diff --git a/packages/common/dbp-common-demo.js b/packages/common/dbp-common-demo.js
index 025b1c9b11d60d126cc7bae710fdb617a01c6765..7d64a452932cc2df47b053f1790ea48b8c34b0d8 100644
--- a/packages/common/dbp-common-demo.js
+++ b/packages/common/dbp-common-demo.js
@@ -87,7 +87,8 @@ export class DbpCommonDemo extends ScopedElementsMixin(LitElement) {
 
     buttonClickHandler() {
         setTimeout(() => {
-            this.shadowRoot.querySelector("dbp-button").stop();
+            const scopedTagName = this.constructor.getScopedTagName('dbp-button');
+            this.shadowRoot.querySelector(scopedTagName).stop();
         }, 1000);
     }