diff --git a/Application/RConParsers/DynamicRConParserConfiguration.cs b/Application/RConParsers/DynamicRConParserConfiguration.cs
index b5a5225d6..346191fde 100644
--- a/Application/RConParsers/DynamicRConParserConfiguration.cs
+++ b/Application/RConParsers/DynamicRConParserConfiguration.cs
@@ -64,6 +64,7 @@ namespace IW4MAdmin.Application.RConParsers
             const string mapRotateCommand = "map_rotate";
             const string mapCommand = "map";
             const string fastRestartCommand = "fast_restart";
+            const string quitCommand = "quit";
 
             foreach (var command in new[] { mapRotateCommand, mapCommand, fastRestartCommand})
             {
@@ -72,6 +73,11 @@ namespace IW4MAdmin.Application.RConParsers
                     OverrideCommandTimeouts.Add(command, 45);
                 }
             }
+
+            if (!OverrideCommandTimeouts.ContainsKey(quitCommand))
+            {
+                OverrideCommandTimeouts.Add(quitCommand, 0); // we don't want to wait for a response when we quit the server
+            }
         }
     }
 }