diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 208d59c7a6..b657d2fc5c 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1245,10 +1245,12 @@ export default {
     },
 
     changeChart() {
-      this.view.tableId = this.changeTable.id
-      this.view.xaxis = []
-      this.view.yaxis = []
-      this.view.customFilter = []
+      if (this.view.tableId !== this.changeTable.id) {
+        this.view.tableId = this.changeTable.id
+        this.view.xaxis = []
+        this.view.yaxis = []
+        this.view.customFilter = []
+      }
       this.save(true, 'chart', false)
     },
 
diff --git a/frontend/src/views/chart/view/TableSelector.vue b/frontend/src/views/chart/view/TableSelector.vue
index 53ac2d5629..0741875729 100644
--- a/frontend/src/views/chart/view/TableSelector.vue
+++ b/frontend/src/views/chart/view/TableSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <de-container>
     <de-aside-container>
-      <dataset-group-selector-tree @getTable="getTable" :privileges=privileges :mode=mode :type=type :customType=customType :showMode=showMode />
+      <dataset-group-selector-tree :privileges="privileges" :mode="mode" :type="type" :custom-type="customType" :show-mode="showMode" @getTable="getTable" />
     </de-aside-container>
     <de-main-container>
       <dataset-table-data :table="table" />