diff --git a/packages/grid/src/grid.ts b/packages/grid/src/grid.ts
index 8034a584fd80ee1edf74679e6d7ce70b979ed5ff..136667c18effb14ad1475bd4fd6e1e1ccf086a62 100644
--- a/packages/grid/src/grid.ts
+++ b/packages/grid/src/grid.ts
@@ -1162,7 +1162,7 @@ export default defineComponent({
         const { data, columns, proxyConfig } = props
         const proxyOpts = computeProxyOpts.value
         const formOpts = computeFormOpts.value
-        if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
+        if (proxyConfig && proxyConfig.enabled && (data || (proxyOpts.form && formOpts.data))) {
           errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
         }
         if (columns && columns.length) {