diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 46237a06..c257f245 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -705,6 +705,10 @@ def parse_commandline():
                       help="Update the wiki")
     options, args = parser.parse_args()
 
+    # Force --stop with --on-server to get cotrect exit code
+    if options.onserver:
+        options.stop = True
+
     # The --install option implies --test and --force...
     if options.install:
         if options.server: