diff --git a/apps/builder/src/page/App/components/InspectPanel/PanelSetters/ChartSetter/chartKeysDynamicSelectSetter.tsx b/apps/builder/src/page/App/components/InspectPanel/PanelSetters/ChartSetter/chartKeysDynamicSelectSetter.tsx
index 7fbb9d2ca0..d16487fa11 100644
--- a/apps/builder/src/page/App/components/InspectPanel/PanelSetters/ChartSetter/chartKeysDynamicSelectSetter.tsx
+++ b/apps/builder/src/page/App/components/InspectPanel/PanelSetters/ChartSetter/chartKeysDynamicSelectSetter.tsx
@@ -126,9 +126,13 @@ const ChartKeysDynamicSelectSetter: FC<ChartDataSourceSetterProps> = (
   })
 
   const isDynamic = useMemo(() => {
-    const dataSourceMode = get(targetComponentProps, "keySelectMode", "select")
+    const dataSourceMode = get(
+      targetComponentProps,
+      `${widgetDisplayName}.${attrName}JS`,
+      "select",
+    )
     return dataSourceMode === "dynamic"
-  }, [targetComponentProps])
+  }, [attrName, targetComponentProps, widgetDisplayName])
 
   const finalValue = useMemo(() => {
     return get(panelConfig, attrName, "")
@@ -137,19 +141,26 @@ const ChartKeysDynamicSelectSetter: FC<ChartDataSourceSetterProps> = (
   const handleClickFxButton = useCallback(() => {
     const isInOption = selectedOptions.some((value) => value === finalValue)
     if (isDynamic) {
-      handleUpdateDsl("keySelectMode", "select")
+      handleUpdateDsl(`${widgetDisplayName}.${attrName}JS`, "select")
       if (!isInOption) {
         handleUpdateDsl(attrName, "")
       } else {
         handleUpdateDsl(attrName, finalValue)
       }
     } else {
-      handleUpdateDsl("keySelectMode", "dynamic")
+      handleUpdateDsl(`${widgetDisplayName}.${attrName}JS`, "dynamic")
       if (isInOption) {
         handleUpdateDsl(attrName, finalValue)
       }
     }
-  }, [selectedOptions, isDynamic, finalValue, handleUpdateDsl, attrName])
+  }, [
+    selectedOptions,
+    isDynamic,
+    finalValue,
+    handleUpdateDsl,
+    widgetDisplayName,
+    attrName,
+  ])
 
   const handleChangeSelect = useCallback(
     (value: string) => {
diff --git a/apps/builder/src/widgetLibrary/ChartWidget/panelConfig.tsx b/apps/builder/src/widgetLibrary/ChartWidget/panelConfig.tsx
index 6bfd4fe797..51826c5492 100644
--- a/apps/builder/src/widgetLibrary/ChartWidget/panelConfig.tsx
+++ b/apps/builder/src/widgetLibrary/ChartWidget/panelConfig.tsx
@@ -488,7 +488,7 @@ export const CHART_PANEL_CONFIG: PanelConfig[] = [
             attrName: "shadow",
             setterType: "SHADOW_SELECT_SETTER",
             useCustomLayout: true,
-            defaultValue: "small",
+            defaultValue: "none",
           },
         ],
       },
diff --git a/apps/builder/src/widgetLibrary/ChartWidget/widgetConfig.tsx b/apps/builder/src/widgetLibrary/ChartWidget/widgetConfig.tsx
index 5b4ac56550..0f26b725ad 100644
--- a/apps/builder/src/widgetLibrary/ChartWidget/widgetConfig.tsx
+++ b/apps/builder/src/widgetLibrary/ChartWidget/widgetConfig.tsx
@@ -72,6 +72,6 @@ export function initChartWidgetDefaultProps() {
     dateFormat: "YYYY-MM-DD",
     radius: "4px",
     backgroundColor: "#ffffffff",
-    shadow: "small",
+    shadow: "none",
   }
 }