diff --git a/GitHubExtension/Program.cs b/GitHubExtension/Program.cs
index f05c715..77d357a 100644
--- a/GitHubExtension/Program.cs
+++ b/GitHubExtension/Program.cs
@@ -171,6 +171,8 @@ private static async Task HandleCOMServerActivationAsync()
         // This will make the main thread wait until the event is signalled by the extension class.
         // Since we have single instance of the extension object, we exit as soon as it is disposed.
         extensionDisposedEvent.WaitOne();
+        server.Stop();
+        server.UnsafeDispose();
     }
 
     private static void HandleExtensionInstanceRelease(object? sender, ManualResetEvent e) => DecompositionRoot(_disposables!, e);