diff --git a/src/ripple/rpc/impl/RPCHelpers.cpp b/src/ripple/rpc/impl/RPCHelpers.cpp
index 44eebdcaba7..35643d67e5f 100644
--- a/src/ripple/rpc/impl/RPCHelpers.cpp
+++ b/src/ripple/rpc/impl/RPCHelpers.cpp
@@ -761,6 +761,11 @@ readLimitField(
             return RPC::expected_field_error(jss::limit, "unsigned integer");
 
         limit = jvLimit.asUInt();
+        if ((limit < range.rmin || limit > range.rmax) &&
+            context.apiVersion > 1u)
+        {
+            return rpcError(rpcINVALID_PARAMS);
+        }
         if (!isUnlimited(context.role))
             limit = std::max(range.rmin, std::min(range.rmax, limit));
     }
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index 7de5b73671e..b60887b7962 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -21,9 +21,9 @@
 #include <ripple/json/json_value.h>
 #include <ripple/json/to_string.h>
 #include <ripple/protocol/jss.h>
-#include <test/jtx.h>
-
+#include <ripple/rpc/impl/RPCHelpers.h>
 #include <boost/utility/string_ref.hpp>
+#include <test/jtx.h>
 
 #include <algorithm>
 
@@ -112,135 +112,163 @@ class AccountObjects_test : public beast::unit_test::suite
 {
 public:
     void
-    testErrors()
+    testErrors(unsigned int testVersion)
     {
-        testcase("error cases");
+        testcase("error cases Api Version " + std::to_string(testVersion));
 
         using namespace jtx;
         Env env(*this);
 
-        // test error on no account
-        {
-            auto resp = env.rpc("json", "account_objects");
-            BEAST_EXPECT(resp[jss::error_message] == "Syntax error.");
-        }
-        // test error on  malformed account string.
-        {
-            Json::Value params;
-            params[jss::account] =
-                "n94JNrQYkDrpt62bbSR7nVEhdyAvcJXRAsjEkFYyqRkh9SUTYEqV";
-            auto resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] == "Account malformed.");
-        }
-        // test error on account that's not in the ledger.
+        if (testVersion < 2)
         {
-            Json::Value params;
-            params[jss::account] = Account{"bogie"}.human();
-            auto resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] == "Account not found.");
-        }
-        Account const bob{"bob"};
-        // test error on large ledger_index.
-        {
-            Json::Value params;
-            params[jss::account] = bob.human();
-            params[jss::ledger_index] = 10;
-            auto resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] == "ledgerNotFound");
-        }
+            // test error on no account
+            {
+                auto resp = env.rpc("json", "account_objects");
+                BEAST_EXPECT(resp[jss::error_message] == "Syntax error.");
+            }
+            // test error on  malformed account string.
+            {
+                Json::Value params;
+                params[jss::account] =
+                    "n94JNrQYkDrpt62bbSR7nVEhdyAvcJXRAsjEkFYyqRkh9SUTYEqV";
+                auto resp =
+                    env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Account malformed.");
+            }
+            // test error on account that's not in the ledger.
+            {
+                Json::Value params;
+                params[jss::account] = Account{"bogie"}.human();
+                auto resp =
+                    env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Account not found.");
+            }
+            Account const bob{"bob"};
+            // test error on large ledger_index.
+            {
+                Json::Value params;
+                params[jss::account] = bob.human();
+                params[jss::ledger_index] = 10;
+                auto resp =
+                    env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] == "ledgerNotFound");
+            }
 
-        env.fund(XRP(1000), bob);
-        // test error on type param not a string
-        {
-            Json::Value params;
-            params[jss::account] = bob.human();
-            params[jss::type] = 10;
-            auto resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'type', not string.");
-        }
-        // test error on type param not a valid type
-        {
-            Json::Value params;
-            params[jss::account] = bob.human();
-            params[jss::type] = "expedited";
-            auto resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'type'.");
-        }
-        // test error on limit -ve
-        {
-            Json::Value params;
-            params[jss::account] = bob.human();
-            params[jss::limit] = -1;
-            auto resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'limit', not unsigned integer.");
+            env.fund(XRP(1000), bob);
+            // test error on type param not a string
+            {
+                Json::Value params;
+                params[jss::account] = bob.human();
+                params[jss::type] = 10;
+                auto resp =
+                    env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'type', not string.");
+            }
+            // test error on type param not a valid type
+            {
+                Json::Value params;
+                params[jss::account] = bob.human();
+                params[jss::type] = "expedited";
+                auto resp =
+                    env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'type'.");
+            }
+            // test error on limit -ve
+            {
+                Json::Value params;
+                params[jss::account] = bob.human();
+                params[jss::limit] = -1;
+                auto resp =
+                    env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'limit', not unsigned integer.");
+            }
+            // test errors on marker
+            {
+                Account const gw{"G"};
+                env.fund(XRP(1000), gw);
+                auto const USD = gw["USD"];
+                env.trust(USD(1000), bob);
+                env(pay(gw, bob, XRP(1)));
+                env(offer(bob, XRP(100), bob["USD"](1)), txflags(tfPassive));
+
+                Json::Value params;
+                params[jss::account] = bob.human();
+                params[jss::limit] = 1;
+                auto resp =
+                    env.rpc("json", "account_objects", to_string(params));
+
+                auto resume_marker = resp[jss::result][jss::marker];
+                std::string mark = to_string(resume_marker);
+                params[jss::marker] = 10;
+                resp = env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'marker', not string.");
+
+                params[jss::marker] = "This is a string with no comma";
+                resp = env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'marker'.");
+
+                params[jss::marker] = "This string has a comma, but is not hex";
+                resp = env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'marker'.");
+
+                params[jss::marker] = std::string(&mark[1U], 64);
+                resp = env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'marker'.");
+
+                params[jss::marker] = std::string(&mark[1U], 65);
+                resp = env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'marker'.");
+
+                params[jss::marker] = std::string(&mark[1U], 65) + "not hex";
+                resp = env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::error_message] ==
+                    "Invalid field 'marker'.");
+
+                // Should this be an error?
+                // A hex digit is absent from the end of marker.
+                // No account objects returned.
+                params[jss::marker] = std::string(&mark[1U], 128);
+                resp = env.rpc("json", "account_objects", to_string(params));
+                BEAST_EXPECT(
+                    resp[jss::result][jss::account_objects].size() == 0);
+            }
         }
-        // test errors on marker
+        else
         {
-            Account const gw{"G"};
-            env.fund(XRP(1000), gw);
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), bob);
-            env(pay(gw, bob, XRP(1)));
-            env(offer(bob, XRP(100), bob["USD"](1)), txflags(tfPassive));
-
             Json::Value params;
+            Account const bob{"bob"};
+            env.fund(XRP(1000), bob);
             params[jss::account] = bob.human();
+            params[jss::api_version] = testVersion;
             params[jss::limit] = 1;
             auto resp = env.rpc("json", "account_objects", to_string(params));
+            BEAST_EXPECT(resp[jss::result][jss::error] == "invalidParams");
 
-            auto resume_marker = resp[jss::result][jss::marker];
-            std::string mark = to_string(resume_marker);
-            params[jss::marker] = 10;
-            resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'marker', not string.");
-
-            params[jss::marker] = "This is a string with no comma";
-            resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'marker'.");
-
-            params[jss::marker] = "This string has a comma, but is not hex";
-            resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'marker'.");
-
-            params[jss::marker] = std::string(&mark[1U], 64);
+            params[jss::limit] = 401;
             resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'marker'.");
-
-            params[jss::marker] = std::string(&mark[1U], 65);
-            resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'marker'.");
-
-            params[jss::marker] = std::string(&mark[1U], 65) + "not hex";
-            resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(
-                resp[jss::result][jss::error_message] ==
-                "Invalid field 'marker'.");
-
-            // Should this be an error?
-            // A hex digit is absent from the end of marker.
-            // No account objects returned.
-            params[jss::marker] = std::string(&mark[1U], 128);
-            resp = env.rpc("json", "account_objects", to_string(params));
-            BEAST_EXPECT(resp[jss::result][jss::account_objects].size() == 0);
+            BEAST_EXPECT(resp[jss::result][jss::error] == "invalidParams");
         }
     }
 
@@ -802,7 +830,13 @@ class AccountObjects_test : public beast::unit_test::suite
     void
     run() override
     {
-        testErrors();
+        for (unsigned int testVersion = RPC::apiMinimumSupportedVersion;
+             testVersion <= RPC::apiBetaVersion;
+             ++testVersion)
+        {
+            testErrors(testVersion);
+        }
+
         testUnsteppedThenStepped();
         testUnsteppedThenSteppedWithNFTs();
         testObjectTypes();