diff --git a/components/table/Table.jsx b/components/table/Table.jsx
index 96921909f..73e7a9933 100755
--- a/components/table/Table.jsx
+++ b/components/table/Table.jsx
@@ -141,7 +141,7 @@ export default {
     // this.columns = props.columns || normalizeColumns(props.children)
     const props = getOptionProps(this);
     warning(
-      !props.expandedRowRender || !('scroll' in props),
+      !props.expandedRowRender || !('scroll' in props) || !props.scroll.x,
       '`expandedRowRender` and `scroll` are not compatible. Please use one of them at one time.',
     );
     this.CheckboxPropsCache = {};