diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index 17892d786e..160735c00b 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -464,12 +464,14 @@ export default {
     bus.$off('trigger-filter-loaded', this.triggerFilterLoaded)
   },
   methods: {
-    triggerFilterLoaded({ canvasIdStr, p }) {
-      canvasIdStr.includes(this.canvasId) || this.filterLoaded(p, canvasIdStr)
+    triggerFilterLoaded({ canvasIdStr, panelId, p }) {
+      if (this.panelInfo.id === panelId && !canvasIdStr.includes(this.canvasId)) {
+        this.filterLoaded(p, canvasIdStr)
+      }
     },
     filterLoaded(p, canvasIdStr = '') {
       buildAfterFilterLoaded(this.filterMap, p)
-      bus.$emit('trigger-filter-loaded', { canvasIdStr: canvasIdStr + this.canvasId, p })
+      bus.$emit('trigger-filter-loaded', { canvasIdStr: (canvasIdStr + this.canvasId), panelId: this.panelInfo.id, p })
     },
     getWrapperChildRefs() {
       return this.$refs['viewWrapperChild']