diff --git a/server/mergin/commands.py b/server/mergin/commands.py
index 3b2b16d4..50d5ae0b 100644
--- a/server/mergin/commands.py
+++ b/server/mergin/commands.py
@@ -84,6 +84,7 @@ def _send_email(email: str):
 
     def _check_server():  # pylint: disable=W0612
         """Check server configuration."""
+        from .stats.models import MerginInfo
 
         _echo_title("Server health check")
         edition_map = {
@@ -111,6 +112,14 @@ def _check_server():  # pylint: disable=W0612
         else:
             click.secho(f"Your contact email is {contact_email}.", fg="green")
 
+        info = MerginInfo.query.first()
+        service_id = app.config.get("SERVICE_ID") or (info.service_id if info else None)
+
+        if service_id:
+            click.secho(f"Service ID is {service_id}.", fg="green")
+        else:
+            _echo_error("No service ID set.")
+
         tables = db.engine.table_names()
         if not tables:
             _echo_error("Database not initialized. Run flask init-db command")