diff --git a/storage-manager/src/Downloader.cpp b/storage-manager/src/Downloader.cpp
index 7d21b7b4f..1a0897f9f 100644
--- a/storage-manager/src/Downloader.cpp
+++ b/storage-manager/src/Downloader.cpp
@@ -214,7 +214,11 @@ void Downloader::configListener()
   // Downloader threads
   string stmp = Config::get()->getValue("ObjectStorage", "max_concurrent_downloads");
   if (maxDownloads == 0)
+  {
     maxDownloads = 20;
+    workers.setMaxThreads(maxDownloads);
+    logger->log(LOG_INFO, "max_concurrent_downloads = %u",maxDownloads);
+  }
   if (stmp.empty())
   {
     logger->log(LOG_CRIT, "max_concurrent_downloads is not set. Using current value = %u", maxDownloads);
diff --git a/storage-manager/src/Synchronizer.cpp b/storage-manager/src/Synchronizer.cpp
index ed02f5eb1..1c48f0887 100644
--- a/storage-manager/src/Synchronizer.cpp
+++ b/storage-manager/src/Synchronizer.cpp
@@ -884,7 +884,11 @@ void Synchronizer::configListener()
   // Uploader threads
   string stmp = Config::get()->getValue("ObjectStorage", "max_concurrent_uploads");
   if (maxUploads == 0)
+  {
     maxUploads = 20;
+    threadPool->setMaxThreads(maxUploads);
+    logger->log(LOG_INFO, "max_concurrent_uploads = %u",maxUploads);
+  }
   if (stmp.empty())
   {
     logger->log(LOG_CRIT, "max_concurrent_uploads is not set. Using current value = %u", maxUploads);
diff --git a/storage-manager/storagemanager.cnf.in b/storage-manager/storagemanager.cnf.in
index a1b086d4e..1b95faf5a 100644
--- a/storage-manager/storagemanager.cnf.in
+++ b/storage-manager/storagemanager.cnf.in
@@ -55,9 +55,6 @@ journal_path = @ENGINE_DATADIR@/storagemanager/journal
 
 # max_concurrent_downloads is what is sounds like, per node.
 # This is not a global setting.
-# 
-# The default was changed from 20 to 21 as a temporary workaround 
-# for a bug.  It can be anything but 20.
 max_concurrent_downloads = 21
  
 # max_concurrent_uploads is what is sounds like, per node.
@@ -66,9 +63,6 @@ max_concurrent_downloads = 21
 # has low upstream bandwidth, consider lowering this value to the minimum
 # necessary to saturate your network.  This will reduce the latency of certain 
 # operations and improve your experience. 
-#
-# The default was changed from 20 to 21 as a temporary workaround 
-# for a bug.  It can be anything but 20.
 max_concurrent_uploads = 21
 
 # common_prefix_depth is the depth of the common prefix that all files