diff --git a/EduNetworkBuilder/DeviceConfig.cs b/EduNetworkBuilder/DeviceConfig.cs
index 9e7babc..6b70d36 100644
--- a/EduNetworkBuilder/DeviceConfig.cs
+++ b/EduNetworkBuilder/DeviceConfig.cs
@@ -483,8 +483,15 @@ namespace EduNetworkBuilder
             if (NB.GetComponentType(ClonedItem) == GeneralComponentType.device)
             {
                 NetworkDevice nd = (NetworkDevice)ClonedItem;
-                nd.EditGateway(this);
-                UpdateForm();
+                if (nd.HasDHCPNic())
+                {
+                    MessageBox.Show(NB.Translate("DC_CannotEditGateway_DHCP"));
+                }
+                else
+                {
+                    nd.EditGateway(this);
+                    UpdateForm();
+                }
             }
         }
 
diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx
index 030aafe..c6b7561 100644
--- a/EduNetworkBuilder/Resources/languages/edustrings.resx
+++ b/EduNetworkBuilder/Resources/languages/edustrings.resx
@@ -1965,4 +1965,8 @@
     <value>Translate</value>
     <comment>TW_Translate = Translate</comment>
   </data>
+  <data name="DC_CannotEditGateway_DHCP" xml:space="preserve">
+    <value>This device uses DHCP to configure its network settings.  The gateway is set through the DHCP server, and will be updated when this device requests DHCP.  If the gateway is wrong, make sure the gateway on the server is properly set.</value>
+    <comment>This device uses DHCP to configure its network settings.  The gateway is set through the DHCP server, and will be updated when this device requests DHCP.  If the gateway is wrong, make sure the gateway on the server is properly set.</comment>
+  </data>
 </root>
\ No newline at end of file