diff --git a/src/main/java/ee/carlrobert/codegpt/completions/CompletionRequestProvider.java b/src/main/java/ee/carlrobert/codegpt/completions/CompletionRequestProvider.java
index 1af6f0e3..a1be84ed 100644
--- a/src/main/java/ee/carlrobert/codegpt/completions/CompletionRequestProvider.java
+++ b/src/main/java/ee/carlrobert/codegpt/completions/CompletionRequestProvider.java
@@ -135,7 +135,7 @@ public class CompletionRequestProvider {
             new OpenAIChatCompletionStandardMessage("user", context)))
         .setModel(model)
         .setStream(true)
-        .setMaxTokens(2048)
+        .setMaxTokens(ConfigurationSettings.getCurrentState().getMaxTokens())
         .build();
   }