diff --git a/src/ripple/rpc/impl/RPCHandler.cpp b/src/ripple/rpc/impl/RPCHandler.cpp
index 9416080fe..6577c8788 100644
--- a/src/ripple/rpc/impl/RPCHandler.cpp
+++ b/src/ripple/rpc/impl/RPCHandler.cpp
@@ -149,7 +149,9 @@ error_code_i fillHandler (Context& context,
     if (!getConfig ().RUN_STANDALONE
         && (handler->condition_ & NEEDS_CURRENT_LEDGER)
         && (getApp().getLedgerMaster().getValidatedLedgerAge() >
-            Tuning::maxValidatedLedgerAge))
+            Tuning::maxValidatedLedgerAge
+            || context.netOps.getCurrentLedgerID() <=
+                context.netOps.getValidatedLedger ()->getLedgerSeq ()))
     {
         return rpcNO_CURRENT;
     }