diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
index 196645cd..aa4e7072 100644
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -28,6 +28,7 @@
     "dhcp_ip_addresses": "IP addresses",
     "dhcp_table_hostname": "Hostname",
     "dhcp_table_expires": "Expires",
+    "dhcp_warning": "If you want to enable the built-in DHCP server, make sure that there is no other active DHCP server. Otherwise, it can break the internet for connected devices!",
     "back": "Back",
     "dashboard": "Dashboard",
     "settings": "Settings",
diff --git a/client/src/components/Settings/Dhcp/index.js b/client/src/components/Settings/Dhcp/index.js
index 68412a82..5335586b 100644
--- a/client/src/components/Settings/Dhcp/index.js
+++ b/client/src/components/Settings/Dhcp/index.js
@@ -66,14 +66,14 @@ class Dhcp extends Component {
         if (active) {
             if (active.error) {
                 return (
-                    <div className="text-danger">
+                    <div className="text-danger mb-2">
                         {active.error}
                     </div>
                 );
             }
 
             return (
-                <Fragment>
+                <div className="mb-2">
                     {active.found ? (
                         <div className="text-danger">
                             <Trans>dhcp_found</Trans>
@@ -83,7 +83,7 @@ class Dhcp extends Component {
                             <Trans>dhcp_not_found</Trans>
                         </div>
                     )}
-                </Fragment>
+                </div>
             );
         }
 
@@ -130,12 +130,18 @@ class Dhcp extends Component {
                                         onClick={() =>
                                             this.props.findActiveDhcp(dhcp.config.interface_name)
                                         }
-                                        disabled={!dhcp.config.interface_name || dhcp.processingConfig}
+                                        disabled={
+                                            !dhcp.config.interface_name
+                                            || dhcp.processingConfig
+                                        }
                                     >
                                         <Trans>check_dhcp_servers</Trans>
                                     </button>
                                 </div>
                                 {this.getActiveDhcpMessage()}
+                                <div className="text-danger">
+                                    <Trans>dhcp_warning</Trans>
+                                </div>
                             </Fragment>
                         }
                     </div>