diff --git a/emhttp/plugins/dynamix/Eth0.page b/emhttp/plugins/dynamix/Eth0.page
index 926a38605..e7c628697 100644
--- a/emhttp/plugins/dynamix/Eth0.page
+++ b/emhttp/plugins/dynamix/Eth0.page
@@ -210,21 +210,21 @@ function prepareSettings(form) {
   $(form).find('select[name^="USE_DHCP:"]').each(function() {
     var i = $(this).prop('name').split(':')[1];
     var protocol = $(form).find('select[name="PROTOCOL:'+i+'"]').val() || 'ipv4';
-    var gw4 = (port == 'eth0' && i == 0) ? true : $(form).find('input[name="USE_GW4:'+i+'"]').prop('checked');
+    var gw4 = $(form).find('input[name="USE_GW4:'+i+'"]').prop('checked');
+    if (!gw4) $(form).find('input[name="METRIC:'+i+'"]').val('0');
     if (protocol != 'ipv6' && $(this).val() != 'no') {
       $(form).find('input[name="IPADDR:'+i+'"]').val('');
       $(form).find('input[name="GATEWAY:'+i+'"]').val('');
-      $(form).find('input[name="METRIC:'+i+'"]').val(gw4?'':'0');
     }
   });
   $(form).find('select[name^="USE_DHCP6:"]').each(function() {
     var i = $(this).prop('name').split(':')[1];
     var protocol = $(form).find('select[name="PROTOCOL:'+i+'"]').val() || 'ipv4';
-    var gw6 = (port == 'eth0' && i == 0) ? true : $(form).find('input[name="USE_GW6:'+i+'"]').prop('checked');
+    var gw6 = $(form).find('input[name="USE_GW6:'+i+'"]').prop('checked');
+    if (!gw6) $(form).find('input[name="METRIC6:'+i+'"]').val('0');
     if (protocol != 'ipv4' && $(this).val() != 'no') {
       $(form).find('input[name="IPADDR6:'+i+'"]').val('');
       $(form).find('input[name="GATEWAY6:'+i+'"]').val('');
-      $(form).find('input[name="METRIC6:'+i+'"]').val(gw6?'':'0');
     }
     if ($(this).val() != 'yes') $(form).find('input[name="PRIVACY6:'+i+'"]').val('');
   });