diff --git a/ChangeLog b/ChangeLog
index 27555204f..60e3ea30a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	* #2201: Fix error in authmanager if auth file has extra newlines
 	* #2109: Fix the Proxy settings not being cleared by setting None
 	* #2110: Fix accepting magnet uris with xt param anywhere within them
+	* #2204: Fix daemon shutdown hang
 
 ==== GtkUI ====
 	* Add move completed option to add torrent dialog
diff --git a/deluge/core/core.py b/deluge/core/core.py
index 4ca3d9629..42fa0f4b3 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -95,6 +95,8 @@ class Core(component.Component):
         # Set the user agent
         self.settings = lt.session_settings()
         self.settings.user_agent = "Deluge %s" % deluge.common.get_version()
+        # Increase the alert queue size so that alerts don't get lost
+        self.settings.alert_queue_size = 10000
 
         # Set session settings
         self.settings.send_redundant_have = True