diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js
index a13f9692747718402347abae221a1e27f6f31e5e..654ad8b2f1ed56905a46740d83ea91138391c142 100644
--- a/packages/app-shell/src/app-shell.js
+++ b/packages/app-shell/src/app-shell.js
@@ -276,7 +276,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
             this.router.update();
 
             // tell a dbp-provider to update the "lang" property
-            this.sendSetPropertyEvent('lang', lang);
+            this.sendSetPropertyEvent('lang', lang, true);
         }
     }
 
@@ -750,7 +750,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
     }
 
     track(action, message) {
-        this.sendSetPropertyEvent('analytics-event', {'category': action, 'action': message});
+        this.sendSetPropertyEvent('analytics-event', {'category': action, 'action': message}, true);
     }
 
     _renderActivity() {
diff --git a/packages/common/src/adapter-lit-element.js b/packages/common/src/adapter-lit-element.js
index 93ac8c5fad1a4f8284a7d8dd107a0980280fb608..ea57e4c19969dce988e0a980c235dd9cb847162a 100644
--- a/packages/common/src/adapter-lit-element.js
+++ b/packages/common/src/adapter-lit-element.js
@@ -307,9 +307,10 @@ export class AdapterLitElement extends LitElement {
      *
      * @param name
      * @param value
+     * @param sendToSelf Set this to "true" if the event should  be sent to oneself instead of the parent (e.g. in the app shell if there isn't a provider around it)
      * @returns {boolean}
      */
-    sendSetPropertyEvent(name, value) {
+    sendSetPropertyEvent(name, value, sendToSelf = false) {
         // Logger.debug("dbp-set-property", name, value);
 
         const event = new CustomEvent('dbp-set-property', {
@@ -320,7 +321,7 @@ export class AdapterLitElement extends LitElement {
 
         // dispatch the dbp-set-property event to the parent (if there is any) so that the current element
         // doesn't terminate the event if it has the attribute set itself
-        const element = this.parentElement ? this.parentElement : this;
+        const element = this.parentElement && !sendToSelf ? this.parentElement : this;
 
         return element.dispatchEvent(event);
     }