diff --git a/TrueCraft.Client/Program.cs b/TrueCraft.Client/Program.cs
index 04d624a..e314a36 100644
--- a/TrueCraft.Client/Program.cs
+++ b/TrueCraft.Client/Program.cs
@@ -10,14 +10,14 @@ namespace TrueCraft.Client
 {
     public static class Program
     {
+        [STAThread]
         public static void Main(string[] args)
         {
             AppDomain.CurrentDomain.AssemblyResolve += AppDomain_CurrentDomain_AssemblyResolve;
 
-            var thread = new Thread(() => Main_Thread(args));
-            thread.SetApartmentState(ApartmentState.STA);
-            thread.Start();
-            thread.Join();
+            // We need to run this in another method to avoid referencing MonoGame before registering
+            // our AssemblyResolve handler
+            Main_Thread(args);
         }
 
         static Assembly AppDomain_CurrentDomain_AssemblyResolve (object sender, ResolveEventArgs args)