diff --git a/cpp/s2pdump/s2pdump_executor.cpp b/cpp/s2pdump/s2pdump_executor.cpp
index 93cad0cf..f18ba86c 100644
--- a/cpp/s2pdump/s2pdump_executor.cpp
+++ b/cpp/s2pdump/s2pdump_executor.cpp
@@ -222,7 +222,7 @@ void S2pDumpExecutor::SetInt24(span<uint8_t> buf, int offset, int value)
 {
     assert(buf.size() > static_cast<size_t>(offset) + 2);
 
-    buf[offset] = static_cast<uint8_t>(value >> 16);
-    buf[offset + 1] = static_cast<uint8_t>(value >> 8);
+    buf[offset] = static_cast<uint8_t>(static_cast<uint32_t>(value) >> 16);
+    buf[offset + 1] = static_cast<uint8_t>(static_cast<uint32_t>(value) >> 8);
     buf[offset + 2] = static_cast<uint8_t>(value);
 }