diff --git a/mRemoteV1/App/Info/UpdateChannelInfo.cs b/mRemoteV1/App/Info/UpdateChannelInfo.cs
index 8a67013d0..c03de729b 100644
--- a/mRemoteV1/App/Info/UpdateChannelInfo.cs
+++ b/mRemoteV1/App/Info/UpdateChannelInfo.cs
@@ -1,19 +1,16 @@
 namespace mRemoteNG.App.Info
 {
-    public class UpdateChannelInfo
+    public static class UpdateChannelInfo
     {
         public static string FileName
         {
             get
             {
-                #if DEBUG
+#if DEBUG
 				return "update-debug.txt";
-                #else
-                if ((string)(mRemoteNG.Settings.Default.UpdateChannel.ToLowerInvariant()) == "debug")
-                    return "update-debug.txt";
-                else
-                    return "update.txt";
-                #endif
+#else
+                return Settings.Default.UpdateChannel.ToLowerInvariant() == "debug" ? "update-debug.txt" : "update.txt";
+#endif
             }
         }
     }
diff --git a/mRemoteV1/Properties/Settings.Designer.cs b/mRemoteV1/Properties/Settings.Designer.cs
index cbf1dffa4..81ca1a701 100644
--- a/mRemoteV1/Properties/Settings.Designer.cs
+++ b/mRemoteV1/Properties/Settings.Designer.cs
@@ -2169,7 +2169,7 @@ namespace mRemoteNG {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://update.mremoteng.org/")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://mremoteng.org/")]
         public string UpdateAddress {
             get {
                 return ((string)(this["UpdateAddress"]));
diff --git a/mRemoteV1/Properties/Settings.settings b/mRemoteV1/Properties/Settings.settings
index 9a81c55ef..19246c3a5 100644
--- a/mRemoteV1/Properties/Settings.settings
+++ b/mRemoteV1/Properties/Settings.settings
@@ -540,7 +540,7 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="UpdateAddress" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://update.mremoteng.org/</Value>
+      <Value Profile="(Default)">https://mremoteng.org/</Value>
     </Setting>
     <Setting Name="ConDefaultLoadBalanceInfo" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config
index 8874e07db..9fee902af 100644
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -612,7 +612,7 @@
         <value>release</value>
       </setting>
       <setting name="UpdateAddress" serializeAs="String">
-        <value>https://update.mremoteng.org/</value>
+        <value>https://mremoteng.org/</value>
       </setting>
     </mRemoteNG.Settings>
   </applicationSettings>