diff --git a/modules/rpc/jsonrpc.cpp b/modules/rpc/jsonrpc.cpp
index dfb6ce2e5..f39f01cb5 100644
--- a/modules/rpc/jsonrpc.cpp
+++ b/modules/rpc/jsonrpc.cpp
@@ -239,7 +239,8 @@ yyjson_mut_val *JSONRPCServiceInterface::SerializeElement(yyjson_mut_doc *doc, c
 		},
 		[&doc, &elem](int64_t i)
 		{
-			if (std::abs(i) < (1LL << integer_bits))
+			auto bits = std::floor(std::log2(abs(i))) + 1;
+			if (bits <= integer_bits)
 			{
 				// We can fit this into an integer.
 				elem = yyjson_mut_int(doc, i);
@@ -253,7 +254,8 @@ yyjson_mut_val *JSONRPCServiceInterface::SerializeElement(yyjson_mut_doc *doc, c
 		},
 		[&doc, &elem](uint64_t u)
 		{
-			if (u < (1ULL << integer_bits))
+			auto bits = std::floor(std::log2(u)) + 1;
+			if (bits <= integer_bits)
 			{
 				// We can fit this into an integer.
 				elem = yyjson_mut_uint(doc, u);