diff --git a/module_build_service/manage.py b/module_build_service/manage.py
index bbb3243e..fedc79fd 100755
--- a/module_build_service/manage.py
+++ b/module_build_service/manage.py
@@ -7,6 +7,7 @@ import getpass
 import logging
 import os
 import sys
+import argparse
 
 import flask_migrate
 from flask.cli import FlaskGroup
@@ -45,6 +46,12 @@ def upgradedb():
 def upgradedb_entrypoint():
     """Entrypoint for command mbs-upgradedb"""
     # Work around issue with FlaskGroup not being initiated
+    # Argparse to catch --help
+    parser = argparse.ArgumentParser(
+        prog='mbs-upgradedb',
+        description='Upgrades the database schema to the latest revision'
+    )
+    args = parser.parse_args()
     cli(["upgradedb"])