diff --git a/src/shared/Atlassian.Bitbucket.UI.Avalonia/Program.cs b/src/shared/Atlassian.Bitbucket.UI.Avalonia/Program.cs
index ef4a5473f..be0ba8044 100644
--- a/src/shared/Atlassian.Bitbucket.UI.Avalonia/Program.cs
+++ b/src/shared/Atlassian.Bitbucket.UI.Avalonia/Program.cs
@@ -55,6 +55,7 @@ private static void AppMain(object o)
                     .GetAwaiter()
                     .GetResult();
 
+                context.Trace2.Stop(exitCode);
                 Environment.Exit(exitCode);
             }
         }
diff --git a/src/shared/Core/Trace2.cs b/src/shared/Core/Trace2.cs
index d929e0a29..116bf6612 100644
--- a/src/shared/Core/Trace2.cs
+++ b/src/shared/Core/Trace2.cs
@@ -200,11 +200,6 @@ private void TryParseSettings(TextWriter error, IFileSystem fileSystem)
                 }
             }
         }
-
-        if (_writers.Count == 0)
-        {
-            error.WriteLine("warning: unable to set up TRACE2 tracing. No traces will be written.");
-        }
     }
 
     private void WriteVersion(
@@ -314,8 +309,9 @@ public abstract class Trace2Message
     [JsonProperty("sid", Order = 2)]
     public string Sid { get; set; }
 
+    // TODO: Remove this default value when TRACE2 regions are introduced.
     [JsonProperty("thread", Order = 3)]
-    public string Thread { get; set; }
+    public string Thread { get; set; } = "main";
 
     [JsonProperty("time", Order = 4)]
     public DateTimeOffset Time { get; set; }
diff --git a/src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs b/src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs
index 4fa10db4a..57f389879 100644
--- a/src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs
+++ b/src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs
@@ -55,6 +55,7 @@ private static void AppMain(object o)
                     .GetAwaiter()
                     .GetResult();
 
+                context.Trace2.Stop(exitCode);
                 Environment.Exit(exitCode);
             }
         }
diff --git a/src/shared/Git-Credential-Manager/Program.cs b/src/shared/Git-Credential-Manager/Program.cs
index d3e382548..bd62e8b5f 100644
--- a/src/shared/Git-Credential-Manager/Program.cs
+++ b/src/shared/Git-Credential-Manager/Program.cs
@@ -29,7 +29,7 @@ public static void Main(string[] args)
                         );
                     }
                 }
-                
+
                 //
                 // Git Credential Manager's executable used to be named "git-credential-manager-core" before
                 // dropping the "-core" suffix. In order to prevent "helper not found" errors for users who
diff --git a/src/shared/GitHub.UI.Avalonia/Program.cs b/src/shared/GitHub.UI.Avalonia/Program.cs
index 8c429415d..ad20374bc 100644
--- a/src/shared/GitHub.UI.Avalonia/Program.cs
+++ b/src/shared/GitHub.UI.Avalonia/Program.cs
@@ -57,6 +57,7 @@ private static void AppMain(object o)
                     .GetAwaiter()
                     .GetResult();
 
+                context.Trace2.Stop(exitCode);
                 Environment.Exit(exitCode);
             }
         }
diff --git a/src/shared/GitLab.UI.Avalonia/Program.cs b/src/shared/GitLab.UI.Avalonia/Program.cs
index 91d98a1c2..955e6dc0a 100644
--- a/src/shared/GitLab.UI.Avalonia/Program.cs
+++ b/src/shared/GitLab.UI.Avalonia/Program.cs
@@ -54,6 +54,7 @@ private static void AppMain(object o)
                     .GetAwaiter()
                     .GetResult();
 
+                context.Trace2.Stop(exitCode);
                 Environment.Exit(exitCode);
             }
         }
diff --git a/src/windows/Atlassian.Bitbucket.UI.Windows/Program.cs b/src/windows/Atlassian.Bitbucket.UI.Windows/Program.cs
index f348a20cc..d6d1f49b5 100644
--- a/src/windows/Atlassian.Bitbucket.UI.Windows/Program.cs
+++ b/src/windows/Atlassian.Bitbucket.UI.Windows/Program.cs
@@ -28,6 +28,7 @@ public static async Task Main(string[] args)
                     .GetAwaiter()
                     .GetResult();
 
+                context.Trace2.Stop(exitCode);
                 Environment.Exit(exitCode);
             }
         }
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Program.cs b/src/windows/Git-Credential-Manager.UI.Windows/Program.cs
index ad675049d..63bfc8579 100644
--- a/src/windows/Git-Credential-Manager.UI.Windows/Program.cs
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Program.cs
@@ -28,6 +28,7 @@ public static async Task Main(string[] args)
                     .GetAwaiter()
                     .GetResult();
 
+                context.Trace2.Stop(exitCode);
                 Environment.Exit(exitCode);
             }
         }
diff --git a/src/windows/GitHub.UI.Windows/Program.cs b/src/windows/GitHub.UI.Windows/Program.cs
index 7924b8f4b..f12235185 100644
--- a/src/windows/GitHub.UI.Windows/Program.cs
+++ b/src/windows/GitHub.UI.Windows/Program.cs
@@ -30,6 +30,7 @@ public static async Task Main(string[] args)
                     .GetAwaiter()
                     .GetResult();
 
+                context.Trace2.Stop(exitCode);
                 Environment.Exit(exitCode);
             }
         }
diff --git a/src/windows/GitLab.UI.Windows/Program.cs b/src/windows/GitLab.UI.Windows/Program.cs
index 6c58d8279..55a6d27c6 100644
--- a/src/windows/GitLab.UI.Windows/Program.cs
+++ b/src/windows/GitLab.UI.Windows/Program.cs
@@ -28,6 +28,7 @@ public static async Task Main(string[] args)
                     .GetAwaiter()
                     .GetResult();
 
+                context.Trace2.Stop(exitCode);
                 Environment.Exit(exitCode);
             }
         }