diff --git a/DnsServerCore/DnsWebService.cs b/DnsServerCore/DnsWebService.cs
index cbbdc2f7..46dd560f 100644
--- a/DnsServerCore/DnsWebService.cs
+++ b/DnsServerCore/DnsWebService.cs
@@ -3918,7 +3918,14 @@ namespace DnsServerCore
                     string[] strForwardersAddresses = strForwarders.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
                     foreach (string strForwarderAddress in strForwardersAddresses)
-                        forwarders.Add(new NameServerAddress(strForwarderAddress.Trim(), forwarderProtocol));
+                    {
+                        NameServerAddress forwarder = new NameServerAddress(strForwarderAddress.Trim());
+
+                        if (forwarder.Protocol != forwarderProtocol)
+                            forwarder = forwarder.ChangeProtocol(forwarderProtocol);
+
+                        forwarders.Add(forwarder);
+                    }
 
                     _dnsServer.Forwarders = forwarders;
                 }