diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml
index 5454f38d74e..064954b703c 100644
--- a/modules/openapi-generator-cli/pom.xml
+++ b/modules/openapi-generator-cli/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>airline</artifactId>
-            <version>0.7</version>
+            <version>0.8</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.lambdaj</groupId>
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/CompletionCommand.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/CompletionCommand.java
index 4116fe5c1d6..2ffa1208359 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/CompletionCommand.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/CompletionCommand.java
@@ -84,7 +84,8 @@ public class CompletionCommand
                         null,
                         null,
                         suggesterMetadata.getMetadataInjections(),
-                        bindings.build());
+                        bindings.build(),
+                        new DefaultCommandFactory<Suggester>());
 
                 return suggester.suggest();
             }