diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index b4a6cd0a84..21380ad271 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -836,7 +836,7 @@ const calcData = (view, resetDrill = false, updateQuery = '') => {
 
 const updateChartData = view => {
   curComponent.value['state'] = 'ready'
-  useEmitt().emitter.emit('checkFieldIsAllowEmpty', allFields.value)
+  useEmitt().emitter.emit('checkShowEmpty', { allFields: allFields.value, view: view })
   calcData(view, true, 'updateQuery')
 }
 
diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index a43c0f547f..bd4eaa7404 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -641,8 +641,12 @@ onMounted(() => {
     return
   }
   useEmitt({
-    name: 'checkFieldIsAllowEmpty',
-    callback: allField => checkFieldIsAllowEmpty(allField)
+    name: 'checkShowEmpty',
+    callback: param => {
+      if (param.view?.id === view.value.id) {
+        checkFieldIsAllowEmpty(param.allFields)
+      }
+    }
   })
   useEmitt({ name: 'chart-type-change', callback: changeChartType })
   useEmitt({ name: 'dataset-change', callback: changeDataset })