diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 2c74555da..a7d07e2a0 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -49,7 +49,8 @@ set(OLP_SDK_CPP_LEVELDB_URL "https://github.com/google/leveldb.git")
 set(OLP_SDK_CPP_LEVELDB_TAG "1.21")
 
 set(OLP_SDK_CPP_RAPIDJSON_URL "https://github.com/Tencent/rapidjson.git")
-set(OLP_SDK_CPP_RAPIDJSON_TAG "master")
+# Next commit after that breaks our build
+set(OLP_SDK_CPP_RAPIDJSON_TAG "d621dc9e9c77f81e5c8a35b8dcc16dcd63351321")
 
 set(OLP_SDK_CPP_BOOST_URL "https://github.com/boostorg/boost.git")
 set(OLP_SDK_CPP_BOOST_TAG "boost-1.82.0")
diff --git a/external/rapidjson/CMakeLists.txt.rapidjson.in b/external/rapidjson/CMakeLists.txt.rapidjson.in
index 6040c628e..e8a3fc727 100644
--- a/external/rapidjson/CMakeLists.txt.rapidjson.in
+++ b/external/rapidjson/CMakeLists.txt.rapidjson.in
@@ -23,7 +23,7 @@ include(ExternalProject)
 ExternalProject_Add(rapidjson
   GIT_REPOSITORY    @OLP_SDK_CPP_RAPIDJSON_URL@
   GIT_TAG           @OLP_SDK_CPP_RAPIDJSON_TAG@
-  GIT_SHALLOW       1
+  GIT_SHALLOW       0
   INSTALL_DIR       "@EXTERNAL_BINARY_INSTALL_DIR@"
   CMAKE_ARGS        @COMMON_PLATFORM_FLAGS@
                     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>