diff --git a/src/modules/documentExecution/dashboard/DashboardController.vue b/src/modules/documentExecution/dashboard/DashboardController.vue
index 758128fa3..4be3608ae 100644
--- a/src/modules/documentExecution/dashboard/DashboardController.vue
+++ b/src/modules/documentExecution/dashboard/DashboardController.vue
@@ -217,7 +217,7 @@ export default defineComponent({
         },
         async getData() {
             this.loading = true
-            this.dashboardId = cryptoRandomString({ length: 16, type: 'base64' })
+            if (!this.dashboardId) this.dashboardId = cryptoRandomString({ length: 16, type: 'base64' })
             this.$emit('dashboardIdSet', this.dashboardId)
             if (this.filtersData) {
                 this.drivers = loadDrivers(this.filtersData, this.model)
diff --git a/src/modules/documentExecution/main/DocumentExecution.vue b/src/modules/documentExecution/main/DocumentExecution.vue
index e5f57794a..c82f0e27a 100644
--- a/src/modules/documentExecution/main/DocumentExecution.vue
+++ b/src/modules/documentExecution/main/DocumentExecution.vue
@@ -76,7 +76,7 @@
                     :reload-trigger="reloadTrigger"
                     :hidden-form-data="document.hiddenFormData"
                     :mode="'dashboard-popup'"
-                    :filters-data="document.filtersData"
+                    :filters-data="filtersData"
                     :new-dashboard-mode="false"
                 ></DashboardController>
                 <div v-show="mode === 'dashboard' || newDashboardMode" class="p-d-flex p-flex-row" style="height: 100%">
@@ -744,8 +744,7 @@ export default defineComponent({
                 }
             }
             this.hiddenFormData.append('documentMode', this.documentMode)
-
-            this.document.typeCode === 'DATAMART' || this.document.typeCode === 'DOSSIER' || this.document.typeCode === 'OLAP' || (this.document.typeCode === 'DOCUMENT_COMPOSITE' && this.mode === 'dashboard') ? await this.sendHiddenFormData() : postForm.submit()
+            this.document.typeCode === 'DATAMART' || this.document.typeCode === 'DOSSIER' || this.document.typeCode === 'OLAP' || (['DOCUMENT_COMPOSITE', 'DASHBOARD'].includes(this.document.typeCode) && this.mode === 'dashboard') ? await this.sendHiddenFormData() : postForm.submit()
             const index = this.breadcrumbs.findIndex((el: any) => el.label === this.document.name)
             if (index !== -1) this.breadcrumbs[index].hiddenFormData = this.hiddenFormData
         },