diff --git a/cmd/analyze/analyze.go b/cmd/analyze/analyze.go
index 4c7480c1da..a9b3cbe3a2 100644
--- a/cmd/analyze/analyze.go
+++ b/cmd/analyze/analyze.go
@@ -60,6 +60,7 @@ var AnalyzeCmd = &cobra.Command{
 			withDoc,
 			interactiveMode,
 		)
+
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
@@ -124,7 +125,7 @@ func init() {
 	// explain flag
 	AnalyzeCmd.Flags().BoolVarP(&explain, "explain", "e", false, "Explain the problem to me")
 	// add flag for backend
-	AnalyzeCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
+	AnalyzeCmd.Flags().StringVarP(&backend, "backend", "b", "", "Backend AI provider")
 	// output as json
 	AnalyzeCmd.Flags().StringVarP(&output, "output", "o", "text", "Output format (text, json)")
 	// add language options for output
diff --git a/pkg/analysis/analysis.go b/pkg/analysis/analysis.go
index 139d0e7505..17771233e8 100644
--- a/pkg/analysis/analysis.go
+++ b/pkg/analysis/analysis.go
@@ -124,11 +124,15 @@ func NewAnalysis(
 	}
 
 	// Backend string will have high priority than a default provider
-	// Backend as "openai" represents the default CLI argument passed through
-	if configAI.DefaultProvider != "" && backend == "openai" {
+	// Hence, use the default provider only if the backend is not specified by the user.
+	if configAI.DefaultProvider != "" && backend == "" {
 		backend = configAI.DefaultProvider
 	}
 
+	if backend == "" {
+		backend = "openai"
+	}
+
 	var aiProvider ai.AIProvider
 	for _, provider := range configAI.Providers {
 		if backend == provider.Name {
diff --git a/pkg/server/analyze.go b/pkg/server/analyze.go
index 834d25e772..edd4dafaa0 100644
--- a/pkg/server/analyze.go
+++ b/pkg/server/analyze.go
@@ -16,10 +16,6 @@ func (h *handler) Analyze(ctx context.Context, i *schemav1.AnalyzeRequest) (
 		i.Output = "json"
 	}
 
-	if i.Backend == "" {
-		i.Backend = "openai"
-	}
-
 	if int(i.MaxConcurrency) == 0 {
 		i.MaxConcurrency = 10
 	}