diff --git a/include/lib/graft/common/utils.h b/include/lib/graft/common/utils.h
index 5c1e3f25..6fe439cc 100644
--- a/include/lib/graft/common/utils.h
+++ b/include/lib/graft/common/utils.h
@@ -12,8 +12,7 @@ std::string base64_encode(const std::string &data);
 template <typename T>
 T random_number(T startRange, T endRange)
 {
-    std::random_device rd;
-    std::mt19937 mt(rd());
+    static std::mt19937 mt(std::random_device{}());
     std::uniform_int_distribution<T> dist(startRange, endRange);
     return dist(mt);
 }
diff --git a/src/lib/graft/task.cpp b/src/lib/graft/task.cpp
index 30eef7f7..6f61f707 100644
--- a/src/lib/graft/task.cpp
+++ b/src/lib/graft/task.cpp
@@ -6,6 +6,7 @@
 #include "lib/graft/handler_api.h"
 #include "lib/graft/expiring_list.h"
 #include "lib/graft/sys_info.h"
+#include "lib/graft/common/utils.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "supernode.task"
@@ -981,8 +982,9 @@ std::chrono::milliseconds PeriodicTask::getTimeout()
         return m_initial_timeout_ms;
     }
     if(m_random_factor < 0.0001) return m_timeout_ms;
-
-    return std::chrono::milliseconds( int(m_timeout_ms.count() * (1.0 + std::rand()*m_random_factor/RAND_MAX) ));
+    using i_type = decltype(m_timeout_ms.count());
+    i_type v = graft::utils::random_number(m_timeout_ms.count(), (i_type)(m_timeout_ms.count()*(1.0 + m_random_factor)));
+    return std::chrono::milliseconds(v);
 }
 
 ClientTask::ClientTask(ConnectionManager* connectionManager, mg_connection *client, Router::JobParams& prms)