diff --git a/client/src/components/Settings/Dhcp/Leases.js b/client/src/components/Settings/Dhcp/Leases.js
index 3fb1197a..04935c80 100644
--- a/client/src/components/Settings/Dhcp/Leases.js
+++ b/client/src/components/Settings/Dhcp/Leases.js
@@ -1,32 +1,49 @@
-import React from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
 import { Trans, withNamespaces } from 'react-i18next';
 
-const columns = [{
-    Header: 'MAC',
-    accessor: 'mac',
-}, {
-    Header: 'IP',
-    accessor: 'ip',
-}, {
-    Header: <Trans>dhcp_table_hostname</Trans>,
-    accessor: 'hostname',
-}, {
-    Header: <Trans>dhcp_table_expires</Trans>,
-    accessor: 'expires',
-}];
+class Leases extends Component {
+    cellWrap = ({ value }) => (
+        <div className="logs__row logs__row--overflow">
+            <span className="logs__text" title={value}>
+                {value}
+            </span>
+        </div>
+    );
 
-const Leases = props => (
-    <ReactTable
-        data={props.leases || []}
-        columns={columns}
-        showPagination={false}
-        noDataText={ props.t('dhcp_leases_not_found') }
-        minRows={6}
-        className="-striped -highlight card-table-overflow"
-    />
-);
+    render() {
+        const { leases, t } = this.props;
+        return (
+            <ReactTable
+                data={leases || []}
+                columns={[
+                    {
+                        Header: 'MAC',
+                        accessor: 'mac',
+                        Cell: this.cellWrap,
+                    }, {
+                        Header: 'IP',
+                        accessor: 'ip',
+                        Cell: this.cellWrap,
+                    }, {
+                        Header: <Trans>dhcp_table_hostname</Trans>,
+                        accessor: 'hostname',
+                        Cell: this.cellWrap,
+                    }, {
+                        Header: <Trans>dhcp_table_expires</Trans>,
+                        accessor: 'expires',
+                        Cell: this.cellWrap,
+                    },
+                ]}
+                showPagination={false}
+                noDataText={t('dhcp_leases_not_found')}
+                minRows={6}
+                className="-striped -highlight card-table-overflow"
+            />
+        );
+    }
+}
 
 Leases.propTypes = {
     leases: PropTypes.array,