diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
index 233dd65..5a4ca44 100644
--- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
+++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
@@ -6,6 +6,12 @@
     <ApplicationIcon>icon64.ico</ApplicationIcon>
     <RollForward>LatestMajor</RollForward>
     <LangVersion>latest</LangVersion>
+    <Configurations>Debug;Release;NoAutoUpdate</Configurations>
+    <Platforms>AnyCPU</Platforms>
+  </PropertyGroup>
+	
+  <PropertyGroup Condition=" '$(Configuration)' == 'NoAutoUpdate' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
index b1b5416..f8d8d00 100644
--- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
+++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
@@ -5,11 +5,17 @@
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
     <RollForward>LatestMajor</RollForward>
+    <Configurations>Debug;Release;NoAutoUpdate</Configurations>
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 	
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+	
+  <PropertyGroup Condition=" '$(Configuration)' == 'NoAutoUpdate' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\AM2RLauncher\AM2RLauncher.csproj" />
   </ItemGroup>
diff --git a/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj b/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj
index 938dbc9..bacfff8 100644
--- a/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj
+++ b/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj
@@ -18,6 +18,8 @@
     <PackageLicenseExpression>GNU General Public License v3.0</PackageLicenseExpression>
     <Description>A Launcher for AM2R that with mod capabilities.</Description>
     <LangVersion>latest</LangVersion>
+    <Configurations>Debug;Release;NoAutoUpdate</Configurations>
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -28,6 +30,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'NoAutoUpdate' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  </PropertyGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\AM2RLauncher\AM2RLauncher.csproj" />
diff --git a/AM2RLauncher/AM2RLauncher.sln b/AM2RLauncher/AM2RLauncher.sln
index b607052..278aece 100644
--- a/AM2RLauncher/AM2RLauncher.sln
+++ b/AM2RLauncher/AM2RLauncher.sln
@@ -17,28 +17,39 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+		NoAutoUpdate|Any CPU = NoAutoUpdate|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9B67055C-5AEF-4F83-AFE0-38E600183C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9B67055C-5AEF-4F83-AFE0-38E600183C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B67055C-5AEF-4F83-AFE0-38E600183C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B67055C-5AEF-4F83-AFE0-38E600183C9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B67055C-5AEF-4F83-AFE0-38E600183C9F}.NoAutoUpdate|Any CPU.ActiveCfg = NoAutoUpdate|Any CPU
+		{9B67055C-5AEF-4F83-AFE0-38E600183C9F}.NoAutoUpdate|Any CPU.Build.0 = NoAutoUpdate|Any CPU
 		{B3AAD6F3-41B9-4981-8CD4-FE683429AD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3AAD6F3-41B9-4981-8CD4-FE683429AD95}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3AAD6F3-41B9-4981-8CD4-FE683429AD95}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3AAD6F3-41B9-4981-8CD4-FE683429AD95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3AAD6F3-41B9-4981-8CD4-FE683429AD95}.NoAutoUpdate|Any CPU.ActiveCfg = NoAutoUpdate|Any CPU
+		{B3AAD6F3-41B9-4981-8CD4-FE683429AD95}.NoAutoUpdate|Any CPU.Build.0 = NoAutoUpdate|Any CPU
 		{0A619FA8-61B4-48C6-9461-21B3FE137D03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A619FA8-61B4-48C6-9461-21B3FE137D03}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A619FA8-61B4-48C6-9461-21B3FE137D03}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A619FA8-61B4-48C6-9461-21B3FE137D03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A619FA8-61B4-48C6-9461-21B3FE137D03}.NoAutoUpdate|Any CPU.ActiveCfg = NoAutoUpdate|Any CPU
+		{0A619FA8-61B4-48C6-9461-21B3FE137D03}.NoAutoUpdate|Any CPU.Build.0 = NoAutoUpdate|Any CPU
 		{8A162932-BAA3-429A-84C4-B93A1C85DDE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8A162932-BAA3-429A-84C4-B93A1C85DDE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A162932-BAA3-429A-84C4-B93A1C85DDE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A162932-BAA3-429A-84C4-B93A1C85DDE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A162932-BAA3-429A-84C4-B93A1C85DDE3}.NoAutoUpdate|Any CPU.ActiveCfg = NoAutoUpdate|Any CPU
+		{8A162932-BAA3-429A-84C4-B93A1C85DDE3}.NoAutoUpdate|Any CPU.Build.0 = NoAutoUpdate|Any CPU
 		{6F240F19-144E-4704-A16A-8FDAC3867EC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F240F19-144E-4704-A16A-8FDAC3867EC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F240F19-144E-4704-A16A-8FDAC3867EC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F240F19-144E-4704-A16A-8FDAC3867EC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F240F19-144E-4704-A16A-8FDAC3867EC9}.NoAutoUpdate|Any CPU.ActiveCfg = NoAutoUpdate|Any CPU
+		{6F240F19-144E-4704-A16A-8FDAC3867EC9}.NoAutoUpdate|Any CPU.Build.0 = NoAutoUpdate|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
index 35d9c85..b27c29a 100644
--- a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
+++ b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
@@ -8,6 +8,8 @@
     <Company>AM2R-Community-Developers</Company>
     <Description>This is a Launcher for AM2R and its Community Updates.</Description>
     <RepositoryUrl>https://github.com/AM2R-Community-Developers/AM2RLauncher/</RepositoryUrl>
+    <Configurations>Debug;Release;NoAutoUpdate</Configurations>
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 	
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -22,6 +24,14 @@
     <NoWarn>1701;1702;0090</NoWarn>
   </PropertyGroup>
 	
+  <PropertyGroup Condition=" '$(Configuration)' == 'NoAutoUpdate' ">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <NoWarn>1701;1702;0090</NoWarn>
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  </PropertyGroup>
+	
   <ItemGroup>
     <Content Include="Resources\LauncherIcon.ico" />
   </ItemGroup>
diff --git a/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs b/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
index 6558801..2580e49 100644
--- a/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
+++ b/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
@@ -51,6 +51,11 @@ public static class LauncherUpdater
     /// </summary>
     public static void Main()
     {
+        #if NOAUTOUPDATE
+        log.Info("On \"No auto update\" configuration, skipping auto update.");
+        return;
+        #endif
+        
         log.Info("Running update check...");
 
         // Update section
diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
index 5a2fb77..6bb858d 100644
--- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
+++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
@@ -504,7 +504,7 @@ public partial class MainForm : Form
             Text = Text.AutoUpdateAM2R,
             TextColor = colorGreen
         };
-
+        
         // autoUpdateLauncher checkbox
         autoUpdateLauncherCheck = new CheckBox
         {
@@ -602,7 +602,28 @@ public partial class MainForm : Form
 
         settingsLayout.BeginHorizontal();
         settingsLayout.AddSpace();
-        settingsLayout.AddColumn(null, languageLabel, languageDropDown, autoUpdateAM2RCheck, autoUpdateLauncherCheck, hqMusicPCCheck, hqMusicAndroidCheck, profileDebugLogCheck, customEnvVarLabel, (Control)customEnvVarTextBox ?? new Label(), mirrorLabel, mirrorDropDown, customMirrorCheck, customMirrorTextBox, null);
+        List<Control> settingsElements = new List<Control>
+        {
+            null, 
+            languageLabel, 
+            languageDropDown, 
+            autoUpdateAM2RCheck, 
+            autoUpdateLauncherCheck, 
+            hqMusicPCCheck, 
+            hqMusicAndroidCheck, 
+            profileDebugLogCheck, 
+            customEnvVarLabel, 
+            (Control)customEnvVarTextBox ?? new Label(),
+            mirrorLabel, 
+            mirrorDropDown, 
+            customMirrorCheck, 
+            customMirrorTextBox, 
+            null
+        };
+        #if NOAUTOUPDATE
+        settingsElements.Remove(autoUpdateLauncherCheck);
+        #endif
+        settingsLayout.AddColumn(settingsElements.ToArray());
         settingsLayout.AddSpace();
 
         TabPage settingsPage = new TabPage
diff --git a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
index 2bb52d3..ae14963 100644
--- a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
+++ b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
@@ -3,6 +3,12 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>default</LangVersion>
+    <Configurations>Debug;Release;NoAutoUpdate</Configurations>
+    <Platforms>AnyCPU</Platforms>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'NoAutoUpdate' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/AM2RLauncher/AM2RLauncherLib/HelperMethods.cs b/AM2RLauncher/AM2RLauncherLib/HelperMethods.cs
index dd96a5b..eaaee57 100644
--- a/AM2RLauncher/AM2RLauncherLib/HelperMethods.cs
+++ b/AM2RLauncher/AM2RLauncherLib/HelperMethods.cs
@@ -1,7 +1,6 @@
 using log4net;
 using System;
 using System.IO;
-using System.Net;
 using System.Net.NetworkInformation;
 using System.Security.Cryptography;
 
@@ -148,7 +147,7 @@ public static class HelperMethods
     public static bool IsConnectedToInternet()
     {
         log.Info("Checking internet connection...");
-        PingReply pingReply = new Ping().Send("https://github.com");
+        PingReply pingReply = new Ping().Send("github.com");
         if (pingReply?.Status != IPStatus.Success)
         {
             log.Info("Internet connection failed.");