diff --git a/new-lamassu-admin/src/components/tables/DataTable.js b/new-lamassu-admin/src/components/tables/DataTable.js
index ec68f3e1..df57376b 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.js
+++ b/new-lamassu-admin/src/components/tables/DataTable.js
@@ -185,22 +185,24 @@ const DataTable = ({
         <TBody className={classes.body}>
           {loading && <H4>Loading...</H4>}
           {!loading && R.isEmpty(data) && <EmptyTable message={emptyText} />}
-          <AutoSizer disableWidth>
-            {({ height }) => (
-              <List
-                // this has to be in a style because of how the component works
-                style={{ overflow: 'inherit', outline: 'none' }}
-                {...props}
-                height={loading ? 0 : height}
-                width={width}
-                rowCount={data.length}
-                rowHeight={cache.rowHeight}
-                rowRenderer={rowRenderer}
-                overscanRowCount={5}
-                deferredMeasurementCache={cache}
-              />
-            )}
-          </AutoSizer>
+          {!R.isEmpty(data) && (
+            <AutoSizer disableWidth>
+              {({ height }) => (
+                <List
+                  // this has to be in a style because of how the component works
+                  style={{ overflow: 'inherit', outline: 'none' }}
+                  {...props}
+                  height={loading ? 0 : height}
+                  width={width}
+                  rowCount={data.length}
+                  rowHeight={cache.rowHeight}
+                  rowRenderer={rowRenderer}
+                  overscanRowCount={5}
+                  deferredMeasurementCache={cache}
+                />
+              )}
+            </AutoSizer>
+          )}
         </TBody>
       </Table>
     </Box>