diff --git a/src/borg/archiver.py b/src/borg/archiver.py
index 4dc5dacce..7df210e5b 100644
--- a/src/borg/archiver.py
+++ b/src/borg/archiver.py
@@ -231,12 +231,13 @@ class Archiver:
 
     def do_serve(self, args):
         """Start in server mode. This command is usually not used manually."""
-        return RepositoryServer(
+        RepositoryServer(
             restrict_to_paths=args.restrict_to_paths,
             restrict_to_repositories=args.restrict_to_repositories,
             append_only=args.append_only,
             storage_quota=args.storage_quota,
         ).serve()
+        return EXIT_SUCCESS
 
     @with_repository(create=True, exclusive=True, manifest=False)
     def do_init(self, args, repository):