diff --git a/command/base.go b/command/base.go
index 79f8cf40a9..e0381267d4 100644
--- a/command/base.go
+++ b/command/base.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"os"
 	"regexp"
 	"strings"
 	"sync"
@@ -88,6 +89,11 @@ func (c *BaseCommand) Client() (*api.Client, error) {
 		return nil, errors.Wrap(err, "failed to create client")
 	}
 
+	// Turn off retries on the CLI
+	if os.Getenv(api.EnvVaultMaxRetries) == "" {
+		client.SetMaxRetries(0)
+	}
+
 	// Set the wrapping function
 	client.SetWrappingLookupFunc(c.DefaultWrappingLookupFunc)
 
diff --git a/command/base_predict.go b/command/base_predict.go
index 4897ad6c05..a280b86e0b 100644
--- a/command/base_predict.go
+++ b/command/base_predict.go
@@ -1,6 +1,7 @@
 package command
 
 import (
+	"os"
 	"sort"
 	"strings"
 	"sync"
@@ -35,6 +36,11 @@ func (p *Predict) Client() *api.Client {
 				client.SetToken(token)
 			}
 
+			// Turn off retries for prediction
+			if os.Getenv(api.EnvVaultMaxRetries) == "" {
+				client.SetMaxRetries(0)
+			}
+
 			p.client = client
 		}
 	})