diff --git a/docs/options.md b/docs/options.md
index 4c2e26f..eafafc6 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -16,12 +16,6 @@
  below 1.0 to leave some cores idle, or above 1.0 if there are more
  disks than CPUs in the filesystem.
 
- If the computed thread count is higher than `BEES_DEFAULT_THREAD_LIMIT`
- (currently 8), then only that number of threads will be created.
- This limit can be overridden by the `--thread-count` option; however,
- be aware that there are [kernel issues with systems that have many CPU
- cores](btrfs-kernel.md) when users try to run bees on all of them.
-
 * `--loadavg-target LOADAVG` or `-g`
 
  Specify load average target for dynamic worker threads.  Default is
diff --git a/src/bees.cc b/src/bees.cc
index 5f4452c..c51d830 100644
--- a/src/bees.cc
+++ b/src/bees.cc
@@ -842,11 +842,6 @@ bees_main(int argc, char *argv[])
 			thread_factor = BEES_DEFAULT_THREAD_FACTOR;
 		}
 		thread_count = max(1U, static_cast<unsigned>(ceil(thread::hardware_concurrency() * thread_factor)));
-		if (thread_count > BEES_DEFAULT_THREAD_LIMIT) {
-			BEESLOGNOTICE("Limiting computed thread count to " << BEES_DEFAULT_THREAD_LIMIT);
-			BEESLOGNOTICE("Use --thread-count to override this limit");
-			thread_count = BEES_DEFAULT_THREAD_LIMIT;
-		}
 	}
 
 	if (load_target != 0) {
diff --git a/src/bees.h b/src/bees.h
index 4ebb9b7..257daeb 100644
--- a/src/bees.h
+++ b/src/bees.h
@@ -86,9 +86,6 @@ const size_t BEES_OPEN_FILE_LIMIT = (BEES_FILE_FD_CACHE_SIZE + BEES_ROOT_FD_CACH
 // Worker thread factor (multiplied by detected number of CPU cores)
 const double BEES_DEFAULT_THREAD_FACTOR = 1.0;
 
-// Don't use more than this number of threads unless explicitly configured
-const size_t BEES_DEFAULT_THREAD_LIMIT = 8;
-
 // Log warnings when an operation takes too long
 const double BEES_TOO_LONG = 5.0;