diff --git a/core/dbt/cli/main.py b/core/dbt/cli/main.py
index a8613693285..31a4a319b76 100644
--- a/core/dbt/cli/main.py
+++ b/core/dbt/cli/main.py
@@ -128,6 +128,7 @@ def global_flags(func):
     @p.fail_fast
     @p.log_cache_events
     @p.log_file_max_bytes
+    @p.log_format
     @p.log_format_file
     @p.log_level
     @p.log_level_file
@@ -149,6 +150,8 @@ def global_flags(func):
     @p.use_experimental_parser
     @p.version
     @p.version_check
+    @p.warn_error
+    @p.warn_error_options
     @p.write_json
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
@@ -166,9 +169,6 @@ def wrapper(*args, **kwargs):
 )
 @click.pass_context
 @global_flags
-@p.warn_error
-@p.warn_error_options
-@p.log_format
 def cli(ctx, **kwargs):
     """An ELT tool for managing your SQL transformations and data models.
     For more documentation on these commands, visit: docs.getdbt.com