diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bc7fb000..0f4936900 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # timemory
 
+## Version 4.0.1rc0
+
+> Date: Tue Dec 3, 2025
+
+### Bug Fixes
+
+- Fixed hard-coded thread limit in `operation::set_storage`
+  - Changed from `max_threads = 4096` to use `TIMEMORY_MAX_THREADS`
+  - Prevents segfaults when Linux thread IDs exceed 4096
+
 ## Version 3.2.4
 
 > Date: Mon Jul 19 17:22:28 2021 -0500
diff --git a/VERSION b/VERSION
index b19ee8389..c8621cb54 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.0rc0
+4.0.1rc0
diff --git a/source/timemory/operations/types.hpp b/source/timemory/operations/types.hpp
index 40d6ad052..cb0850176 100644
--- a/source/timemory/operations/types.hpp
+++ b/source/timemory/operations/types.hpp
@@ -813,7 +813,7 @@ template <typename T>
 struct set_storage
 {
     friend struct get_storage<T>;
-    static constexpr size_t max_threads = 4096;
+    static constexpr size_t max_threads = TIMEMORY_MAX_THREADS;
     using type                          = T;
     using storage_array_t               = std::array<storage<type>*, max_threads>;