diff --git a/package.json b/package.json
index 27c2460f..8e8d2b28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@civicactions/data-catalog-components",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "React Components for Open Data Catalogs.",
   "main": "lib/index.js",
   "repository": {
diff --git a/src/templates/DataTable/index.jsx b/src/templates/DataTable/index.jsx
index cfbd8a04..4e9a72c0 100644
--- a/src/templates/DataTable/index.jsx
+++ b/src/templates/DataTable/index.jsx
@@ -45,7 +45,7 @@ const DataTable = () => {
     }
   }, [resourceState.store, filters]);
 
-  if (!reactTable.data.length) {
+  if (!reactTable.columns.length) {
     return null;
   }
 
@@ -103,6 +103,12 @@ const DataTable = () => {
           ))}
         </div>
         <div {...getTableBodyProps()} className="dc-tbody">
+          {page.length <= 0
+            &&(
+            <div className="tr dc-tr" style={{textAlign: 'center'}}>
+              No results found.
+            </div>)
+          }
           {page.map((row) => {
             prepareRow(row);
             return (
diff --git a/src/templates/DataTableHeader/index.jsx b/src/templates/DataTableHeader/index.jsx
index ba30c245..d115ecfd 100644
--- a/src/templates/DataTableHeader/index.jsx
+++ b/src/templates/DataTableHeader/index.jsx
@@ -9,7 +9,7 @@ import DataIcon from '../../components/DataIcon';
 const DataTableHeader = () => {
   const { reactTable, resourceState, dispatch } = React.useContext(ResourceDispatch);
 
-  if (!reactTable.data.length) {
+  if (!reactTable.columns.length) {
     return null;
   }
   return (