diff --git a/ChangeLog b/ChangeLog
index 24f3cb031..a6d4047f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 Deluge 1.0.1 (In Development)
+ Core:
+  * Change the default max global upload slots to 4 instead of -1 since libtorrent
+    will automatically open more slots to meet the upload speed limit.
+    
  Misc:
   * Fix #187 set a 5 second timer to save the config file after a config value
     has been changed.
diff --git a/deluge/core/core.py b/deluge/core/core.py
index 03bddf9f9..60e680657 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -84,7 +84,7 @@ DEFAULT_PREFS = {
     "max_connections_global": -1,
     "max_upload_speed": -1.0,
     "max_download_speed": -1.0,
-    "max_upload_slots_global": -1,
+    "max_upload_slots_global": 4,
     "max_half_open_connections": -1,
     "max_connections_per_second": -1,
     "ignore_limits_on_local_network": True,