diff --git a/include/session/random.hpp b/include/session/random.hpp
index 9a37cff8..9968b1e9 100644
--- a/include/session/random.hpp
+++ b/include/session/random.hpp
@@ -3,6 +3,10 @@
 #include <sodium/randombytes.h>
 
 #include <algorithm>
+#include <concepts>
+#include <cstdint>
+#include <limits>
+#include <random>
 
 #include "util.hpp"
 
@@ -75,13 +79,12 @@ std::string unique_id(std::string_view prefix);
 ///
 /// Outputs:
 /// - A random integer in the specified range
-template <typename T>
+template <std::integral T>
 T get_uniform_distribution(T min, T max) {
     if (min > max)
         return min;
 
-    const uint64_t range = static_cast<uint64_t>(max) - static_cast<uint64_t>(min) + 1;
-    return static_cast<T>(static_cast<uint64_t>(min) + (csrng() % range));
+    return std::uniform_int_distribution<T>{min, max}(csrng);
 }
 
 }  // namespace session::random
diff --git a/tests/test_random.cpp b/tests/test_random.cpp
index c02ad515..c571dd74 100644
--- a/tests/test_random.cpp
+++ b/tests/test_random.cpp
@@ -1,4 +1,6 @@
 #include <catch2/catch_test_macros.hpp>
+#include <cstdint>
+#include <limits>
 
 #include "session/random.h"
 #include "session/random.hpp"
@@ -14,3 +16,21 @@ TEST_CASE("Random generation", "[random][random]") {
     CHECK(rand3.size() == 20);
     CHECK(rand1 != rand2);
 }
+
+TEST_CASE("Random uniform distribution", "[random][uniform]") {
+    CHECK(session::random::get_uniform_distribution<int>(7, 7) == 7);
+    CHECK(session::random::get_uniform_distribution<int>(9, 3) == 9);
+    CHECK_NOTHROW(session::random::get_uniform_distribution<uint64_t>(
+            0, std::numeric_limits<uint64_t>::max()));
+    CHECK_NOTHROW(session::random::get_uniform_distribution<int64_t>(
+            std::numeric_limits<int64_t>::min(), std::numeric_limits<int64_t>::max()));
+
+    for (int i = 0; i < 1000; ++i) {
+        const auto signed_value = session::random::get_uniform_distribution<int>(-5, 5);
+        CHECK(signed_value >= -5);
+        CHECK(signed_value <= 5);
+
+        const auto unsigned_value = session::random::get_uniform_distribution<size_t>(0, 10);
+        CHECK(unsigned_value <= 10);
+    }
+}