diff --git a/Server/Main.cs b/Server/Main.cs
index bc04147c2..6eaee0394 100644
--- a/Server/Main.cs
+++ b/Server/Main.cs
@@ -274,7 +274,7 @@ namespace Server
 
 		private static bool OnConsoleEvent( ConsoleEventType type )
 		{
-			if( World.Saving )
+			if( World.Saving || ( m_Service && type == ConsoleEventType.CTRL_LOGOFF_EVENT ) )
 				return true;
 			
 			Kill();