diff --git a/src/Atlasd/Battlenet/Common.cs b/src/Atlasd/Battlenet/Common.cs
index f831823..0505fb8 100644
--- a/src/Atlasd/Battlenet/Common.cs
+++ b/src/Atlasd/Battlenet/Common.cs
@@ -111,8 +111,8 @@ public static void Initialize()
             DefaultPort = 6112;
             InitializeListener();
 
-            NullTimer = new Timer(ProcessNullTimer, ActiveGameStates, 100, 100);
-            PingTimer = new Timer(ProcessPingTimer, ActiveGameStates, 100, 100);
+            NullTimer = new Timer(ProcessNullTimer, ActiveGameStates, 1000, 1000);
+            PingTimer = new Timer(ProcessPingTimer, ActiveGameStates, 1000, 1000);
 
             ScheduledShutdown = new ShutdownEvent(null, true, DateTime.MinValue, null);
 
diff --git a/src/Atlasd/Program.cs b/src/Atlasd/Program.cs
index 32cbd4d..24ccdd5 100644
--- a/src/Atlasd/Program.cs
+++ b/src/Atlasd/Program.cs
@@ -60,8 +60,7 @@ public static async Task<int> Main(string[] args)
 
             while (!Exit)
             {
-                await Task.Delay(1);
-                await Task.Yield();
+                await Task.Delay(250);
             }
 
             return ExitCode;