diff --git a/src/endpoint/s3/s3_errors.js b/src/endpoint/s3/s3_errors.js
index 13965c1398..fe467fe4ab 100644
--- a/src/endpoint/s3/s3_errors.js
+++ b/src/endpoint/s3/s3_errors.js
@@ -164,6 +164,11 @@ S3Error.InvalidBucketState = Object.freeze({
     message: 'The request is not valid with the current state of the bucket.',
     http_code: 409,
 });
+S3Error.ObjectQuotaExceeded = Object.freeze({
+    code: 'ObjectQuotaExceeded',
+    message: 'Object quota exceeded for the bucket.',
+    http_code: 409,
+});
 S3Error.InvalidDigest = Object.freeze({
     code: 'InvalidDigest',
     message: 'The Content-MD5 you specified is not valid.',
@@ -613,6 +618,7 @@ S3Error.RPC_ERRORS_TO_S3 = Object.freeze({
     INVALID_PORT_ORDER: S3Error.InvalidPartOrder,
     INVALID_BUCKET_STATE: S3Error.InvalidBucketState,
     NOT_ENOUGH_SPACE: S3Error.InvalidBucketState,
+    OBJECT_QUOTA_EXCEEDED: S3Error.ObjectQuotaExceeded,
     MALFORMED_POLICY: S3Error.MalformedPolicy,
     NO_SUCH_OBJECT_LOCK_CONFIGURATION: S3Error.NoSuchObjectLockConfiguration,
     OBJECT_LOCK_CONFIGURATION_NOT_FOUND_ERROR: S3Error.ObjectLockConfigurationNotFoundError,
diff --git a/src/server/object_services/object_server.js b/src/server/object_services/object_server.js
index 53432f590d..8fb40ba883 100644
--- a/src/server/object_services/object_server.js
+++ b/src/server/object_services/object_server.js
@@ -1700,7 +1700,7 @@ function check_quota(bucket) {
     if (major_messages.length > 0) {
         const message = major_messages.join();
         dbg.error(message);
-        throw new RpcError('INVALID_BUCKET_STATE', message);
+        throw new RpcError('OBJECT_QUOTA_EXCEEDED', message);
     }
 }