diff --git a/Facepunch.Steamworks/SteamClient.cs b/Facepunch.Steamworks/SteamClient.cs
index be83d68..79d1d17 100644
--- a/Facepunch.Steamworks/SteamClient.cs
+++ b/Facepunch.Steamworks/SteamClient.cs
@@ -41,7 +41,10 @@ namespace Steamworks
 			SteamNetworkingSockets.InstallEvents();
 			SteamInput.InstallEvents();
 
-			RunCallbacksAsync();
+			if ( asyncCallbacks )
+			{
+				RunCallbacksAsync();
+			}
 		}
 
 		static List<SteamInterface> openIterfaces = new List<SteamInterface>();
@@ -73,7 +76,15 @@ namespace Steamworks
 			while ( IsValid )
 			{
 				await Task.Delay( 16 );
-				RunCallbacks();
+
+				try
+				{
+					RunCallbacks();
+				}
+				catch ( System.Exception e )
+				{
+					OnCallbackException?.Invoke( e );
+				}
 			}
 		}
 
@@ -123,14 +134,7 @@ namespace Steamworks
 		{
 			if ( !IsValid ) return;
 
-			try
-			{
-				SteamAPI.RunCallbacks();
-			}
-			catch ( System.Exception e )
-			{
-				OnCallbackException?.Invoke( e );
-			}
+			SteamAPI.RunCallbacks();
 		}
 
 		internal static void UnregisterCallback( IntPtr intPtr )
diff --git a/Facepunch.Steamworks/SteamServer.cs b/Facepunch.Steamworks/SteamServer.cs
index dd8e6db..818d60b 100644
--- a/Facepunch.Steamworks/SteamServer.cs
+++ b/Facepunch.Steamworks/SteamServer.cs
@@ -104,7 +104,10 @@ namespace Steamworks
 
 			InstallEvents();
 
-			RunCallbacksAsync();
+			if ( asyncCallbacks )
+			{
+				RunCallbacksAsync();
+			}
 		}
 
 		static List<SteamInterface> openIterfaces = new List<SteamInterface>();
@@ -147,7 +150,15 @@ namespace Steamworks
 		{
 			while ( IsValid )
 			{
-				RunCallbacks();
+				try
+				{
+					RunCallbacks();
+				}
+				catch ( System.Exception e )
+				{
+					OnCallbackException?.Invoke( e );
+				}
+
 				await Task.Delay( 16 );
 			}
 		}
@@ -157,14 +168,7 @@ namespace Steamworks
 		/// </summary>
 		public static void RunCallbacks()
 		{
-			try
-			{
-				SteamGameServer.RunCallbacks();
-			}
-			catch ( System.Exception e )
-			{
-				OnCallbackException?.Invoke( e );
-			}
+			SteamGameServer.RunCallbacks();
 		}
 
 		/// <summary>