diff --git a/application/cli-app/src/main/java/org/mobilitydata/gtfsvalidator/Main.java b/application/cli-app/src/main/java/org/mobilitydata/gtfsvalidator/Main.java
index d3dfc917ee..61d2c0ee55 100644
--- a/application/cli-app/src/main/java/org/mobilitydata/gtfsvalidator/Main.java
+++ b/application/cli-app/src/main/java/org/mobilitydata/gtfsvalidator/Main.java
@@ -60,9 +60,8 @@ public static void main(String[] args) {
 
             final CommandLine cmd = parser.parse(options, args);
 
-            if (args.length == 0) {
+            if (args.length == 0 || cmd.hasOption("h")) {
                 printHelp(options);
-            } else if (cmd.hasOption("h")) {
                 return;
             }