diff --git a/lib/pact_broker/client/cli/custom_thor.rb b/lib/pact_broker/client/cli/custom_thor.rb
index 3cd0429..76bdfbc 100644
--- a/lib/pact_broker/client/cli/custom_thor.rb
+++ b/lib/pact_broker/client/cli/custom_thor.rb
@@ -28,7 +28,7 @@ def self.massage_args argv
           end
 
           def self.add_broker_config_from_environment_variables argv
-            return argv if argv[0] == 'help' || argv.empty?
+            return argv if argv[0] == '--help' || argv[0] == 'help' || argv.empty?
 
             add_option_from_environment_variable(argv, 'broker-base-url', 'b', 'PACT_BROKER_BASE_URL')
           end