diff --git a/src/xrpld/rpc/handlers/LedgerData.cpp b/src/xrpld/rpc/handlers/LedgerData.cpp
index 31baede65e..7bd50cc1e5 100644
--- a/src/xrpld/rpc/handlers/LedgerData.cpp
+++ b/src/xrpld/rpc/handlers/LedgerData.cpp
@@ -170,16 +170,23 @@ doLedgerDataGrpc(
     }
 
     auto e = ledger->sles.end();
-    if (auto key = uint256::fromVoidChecked(request.end_marker()))
+    if (request.end_marker().size() != 0)
     {
+        auto const key = uint256::fromVoidChecked(request.end_marker());
+
+        if (!key)
+            return {
+                response,
+                {grpc::StatusCode::INVALID_ARGUMENT, "end marker malformed"}};
+
+        if (*key < startKey)
+            return {
+                response,
+                {grpc::StatusCode::INVALID_ARGUMENT,
+                 "end marker out of range"}};
+
         e = ledger->sles.upper_bound(*key);
     }
-    else if (request.end_marker().size() != 0)
-    {
-        grpc::Status errorStatus{
-            grpc::StatusCode::INVALID_ARGUMENT, "end marker malformed"};
-        return {response, errorStatus};
-    }
 
     int maxLimit = RPC::Tuning::pageLength(true);