diff --git a/src/borg/archiver/serve_cmd.py b/src/borg/archiver/serve_cmd.py
index bb0afee1a..b69d60329 100644
--- a/src/borg/archiver/serve_cmd.py
+++ b/src/borg/archiver/serve_cmd.py
@@ -1,5 +1,6 @@
 import argparse
 
+from ._common import Highlander
 from ..constants import *  # NOQA
 from ..helpers import EXIT_SUCCESS
 from ..helpers import parse_storage_quota
@@ -76,6 +77,7 @@ def build_parser_serve(self, subparsers, common_parser, mid_common_parser):
             dest="storage_quota",
             type=parse_storage_quota,
             default=None,
+            action=Highlander,
             help="Override storage quota of the repository (e.g. 5G, 1.5T). "
             "When a new repository is initialized, sets the storage quota on the new "
             "repository as well. Default: no quota.",