diff --git a/core/src/main/java/org/polypheny/db/config/RuntimeConfig.java b/core/src/main/java/org/polypheny/db/config/RuntimeConfig.java
index 7b8993376a..33f503eac4 100644
--- a/core/src/main/java/org/polypheny/db/config/RuntimeConfig.java
+++ b/core/src/main/java/org/polypheny/db/config/RuntimeConfig.java
@@ -391,7 +391,7 @@ public enum RuntimeConfig {
     MONITORING_MAXIMUM_POOL_SIZE(
             "runtime/maximumPoolSize",
             "The maximum number of threads to allow in the pool used for processing workload monitoring events.",
-            5000,
+            8,
             ConfigType.INTEGER,
             "monitoringSettingsQueueGroup" ),
 
diff --git a/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java b/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
index 9c319ee177..568ae14607 100644
--- a/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
+++ b/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
@@ -16,7 +16,7 @@
 
 package org.polypheny.db;
 
-
+import com.github.rvesse.airline.HelpOption;
 import com.github.rvesse.airline.SingleCommand;
 import com.github.rvesse.airline.annotations.Command;
 import com.github.rvesse.airline.annotations.Option;
@@ -24,6 +24,7 @@
 import java.awt.SystemTray;
 import java.io.File;
 import java.io.Serializable;
+import javax.inject.Inject;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.polypheny.db.StatusService.ErrorConfig;
@@ -84,6 +85,9 @@ public class PolyphenyDb {
 
     private final TransactionManager transactionManager = new TransactionManagerImpl();
 
+    @Inject
+    public HelpOption helpOption;
+
     @Option(name = { "-resetCatalog" }, description = "Reset the catalog")
     public boolean resetCatalog = false;
 
@@ -131,6 +135,10 @@ public static void main( final String[] args ) {
             // Hide dock icon on macOS systems
             System.setProperty( "apple.awt.UIElement", "true" );
 
+            if (polyphenyDb.helpOption.showHelpIfRequested()) {
+                return;
+            }
+
             polyphenyDb.runPolyphenyDb();
         } catch ( Throwable uncaught ) {
             if ( log.isErrorEnabled() ) {
@@ -420,4 +428,4 @@ public void join( final long millis ) throws InterruptedException {
         }
     }
 
-}
+}
\ No newline at end of file