diff --git a/GitCommands/Settings/AppSettings.cs b/GitCommands/Settings/AppSettings.cs
index e6d3b9a6153..6e62f6df52a 100644
--- a/GitCommands/Settings/AppSettings.cs
+++ b/GitCommands/Settings/AppSettings.cs
@@ -1883,8 +1883,12 @@ void AddEncodingByName(string s)
                 AddEncoding(Encoding.Default);
                 AddEncoding(new ASCIIEncoding());
                 AddEncoding(new UnicodeEncoding());
-                AddEncoding(new UTF7Encoding());
+
+                // UTF-7 is no longer supported, see: https://github.com/dotnet/docs/issues/19274
+                // AddEncoding(new UTF7Encoding());
+
                 AddEncoding(new UTF8Encoding(false));
+
                 try
                 {
                     AddEncoding(Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage));
@@ -1899,6 +1903,12 @@ void AddEncodingByName(string s)
                 var utf8 = new UTF8Encoding(false);
                 foreach (var encodingName in availableEncodings.Split(';'))
                 {
+                    if (encodingName == Encoding.UTF7.HeaderName)
+                    {
+                        // UTF-7 is no longer supported, see: https://github.com/dotnet/docs/issues/19274
+                        continue;
+                    }
+
                     // create utf-8 without BOM
                     if (encodingName == utf8.HeaderName)
                     {
diff --git a/GitUI/CommandsDialogs/SettingsDialog/FormAvailableEncodings.cs b/GitUI/CommandsDialogs/SettingsDialog/FormAvailableEncodings.cs
index 1848379e2f7..0e766e4bf96 100644
--- a/GitUI/CommandsDialogs/SettingsDialog/FormAvailableEncodings.cs
+++ b/GitUI/CommandsDialogs/SettingsDialog/FormAvailableEncodings.cs
@@ -31,6 +31,7 @@ private void LoadEncoding()
 
             var availableEncoding = Encoding.GetEncodings()
                 .Select(ei => ei.GetEncoding())
+                .Where(e => e != Encoding.UTF7) // UTF-7 is no longer supported, see: https://github.com/dotnet/docs/issues/19274
                 .Where(e => !includedEncoding.ContainsKey(e.HeaderName))
                 .ToList();