diff --git a/components/table/index.jsx b/components/table/index.jsx
index 4c581f910b..127692850c 100644
--- a/components/table/index.jsx
+++ b/components/table/index.jsx
@@ -313,15 +313,15 @@ var AntTable = React.createClass({
     if (this.props.size === 'small') {
       classString += ' mini';
     }
-    let total;
-    if (this.isLocalDataSource()) {
+    let total = this.state.pagination.total;
+    if (!total && this.isLocalDataSource()) {
       total = this.getLocalData().length;
     }
-    return <Pagination className={classString}
+    return (total > 0) ? <Pagination className={classString}
                        onChange={this.handlePageChange}
                        total={total}
                        pageSize={10}
-      {...this.state.pagination} />;
+      {...this.state.pagination} /> : null;
   },
 
   prepareParamsArguments(state) {
diff --git a/style/components/table.less b/style/components/table.less
index 25dff7848f..f98234551d 100644
--- a/style/components/table.less
+++ b/style/components/table.less
@@ -184,6 +184,7 @@
     font-size: 12px;
     color: #999;
     border-bottom: 1px solid #E9E9E9;
+    margin-bottom: 16px;
     .anticon {
       margin-right: 4px;
       position: relative;