diff --git a/src/fireedge/src/client/components/Tables/Enhanced/filters.js b/src/fireedge/src/client/components/Tables/Enhanced/filters.js
index bbc93bbf68..7dc9ba0c8b 100644
--- a/src/fireedge/src/client/components/Tables/Enhanced/filters.js
+++ b/src/fireedge/src/client/components/Tables/Enhanced/filters.js
@@ -40,7 +40,11 @@ const Filters = ({ useTableProps }) => {
   const filters = React.useMemo(() => (
     columns
       .filter(({ canFilter }) => canFilter)
-      .map(column => column.canFilter ? column.render('Filter') : null)
+      .map((column, idx) => column.canFilter ? (
+        <React.Fragment key={idx}>
+          {column.render('Filter')}
+        </React.Fragment>
+      ) : null)
   ), [rows])
 
   if (isMobile) {
diff --git a/src/fireedge/src/client/components/Tables/Enhanced/index.js b/src/fireedge/src/client/components/Tables/Enhanced/index.js
index 3d8e3c5659..8742e8360d 100644
--- a/src/fireedge/src/client/components/Tables/Enhanced/index.js
+++ b/src/fireedge/src/client/components/Tables/Enhanced/index.js
@@ -2,7 +2,7 @@ import * as React from 'react'
 import PropTypes from 'prop-types'
 
 import { InfoEmpty } from 'iconoir-react'
-import { Box, LinearProgress, Typography } from '@material-ui/core'
+import { Box, LinearProgress } from '@material-ui/core'
 import {
   useGlobalFilter,
   useFilters,