diff --git a/core/thread/inc/ROOT/TThreadedObject.hxx b/core/thread/inc/ROOT/TThreadedObject.hxx
index f07fd7555964e..a2b23d31f5489 100644
--- a/core/thread/inc/ROOT/TThreadedObject.hxx
+++ b/core/thread/inc/ROOT/TThreadedObject.hxx
@@ -15,6 +15,7 @@
 #include "TList.h"
 #include "TError.h"
 
+#include <algorithm>
 #include <functional>
 #include <map>
 #include <memory>
@@ -286,7 +287,7 @@ namespace ROOT {
 
    };
 
-   template<class T> unsigned TThreadedObject<T>::fgMaxSlots = 64;
+   template<class T> unsigned TThreadedObject<T>::fgMaxSlots = std::max(std::thread::hardware_concurrency(), 64u);
 
 } // End ROOT namespace